From 56afb5b09c47eeeb9e29580f4e51e015b766a1dc Mon Sep 17 00:00:00 2001
From: hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>
Date: Thu, 15 Oct 2009 17:43:32 +0000
Subject: fix implementation of which()

git-svn-id: http://luarocks.org/svn/luarocks/trunk@101 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
---
 src/luarocks/loader.lua | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua
index 74f8c426..22a5a8df 100644
--- a/src/luarocks/loader.lua
+++ b/src/luarocks/loader.lua
@@ -144,13 +144,16 @@ end
 function which(module)
    local name, version, module_name = 
       select_module(module, function(module_name, name, version, tree, i)
+         local deploy_dir
          if module_name:match("%.lua$") then
-            module_name = path.deploy_lua_dir(tree).."/"..module_name
+            deploy_dir = path.deploy_lua_dir(tree)
+            module_name = deploy_dir.."/"..module_name
          else
-            module_name = path.deploy_lib_dir(tree).."/"..module_name
+            deploy_dir = path.deploy_lib_dir(tree)
+            module_name = deploy_dir.."/"..module_name
          end
          if i > 1 then
-            module_name = path.versioned_name(module_name, tree, name, version)
+            module_name = path.versioned_name(module_name, deploy_dir, name, version)
          end
          return module_name
       end)
-- 
cgit v1.2.3-55-g6feb