diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2014-08-11 12:09:54 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-08-11 12:12:13 -0300 |
commit | 8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd (patch) | |
tree | 037fa7ae15b9346fa5f890e92f00b9f47d36aa78 | |
parent | fa6863a19d3dd40c43975ffb4b3384d9cad40228 (diff) | |
download | luarocks-8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd.tar.gz luarocks-8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd.tar.bz2 luarocks-8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd.zip |
Ensure luarocks.loader sees package paths.
This should fix a bug reported by @tomasguisasola on 2014-07-07.
-rwxr-xr-x | src/bin/luarocks | 1 | ||||
-rwxr-xr-x | src/bin/luarocks-admin | 1 | ||||
-rw-r--r-- | src/luarocks/loader.lua | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/luarocks b/src/bin/luarocks index 9101e675..d2f3c220 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | -- this should be loaded first. | 3 | -- this should be loaded first. |
4 | local cfg = require("luarocks.cfg") | 4 | local cfg = require("luarocks.cfg") |
5 | cfg.init_package_paths() | ||
6 | 5 | ||
7 | local loader = require("luarocks.loader") | 6 | local loader = require("luarocks.loader") |
8 | local command_line = require("luarocks.command_line") | 7 | local command_line = require("luarocks.command_line") |
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index f49db920..2890d1f1 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | -- this should be loaded first. | 3 | -- this should be loaded first. |
4 | local cfg = require("luarocks.cfg") | 4 | local cfg = require("luarocks.cfg") |
5 | cfg.init_package_paths() | ||
6 | 5 | ||
7 | local loader = require("luarocks.loader") | 6 | local loader = require("luarocks.loader") |
8 | local command_line = require("luarocks.command_line") | 7 | local command_line = require("luarocks.command_line") |
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index c200d5ec..1eaa6721 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua | |||
@@ -14,10 +14,12 @@ local unpack = unpack or table.unpack | |||
14 | local loader = {} | 14 | local loader = {} |
15 | package.loaded["luarocks.loader"] = loader | 15 | package.loaded["luarocks.loader"] = loader |
16 | 16 | ||
17 | local cfg = require("luarocks.cfg") | ||
18 | cfg.init_package_paths() | ||
19 | |||
17 | local path = require("luarocks.path") | 20 | local path = require("luarocks.path") |
18 | local manif_core = require("luarocks.manif_core") | 21 | local manif_core = require("luarocks.manif_core") |
19 | local deps = require("luarocks.deps") | 22 | local deps = require("luarocks.deps") |
20 | local cfg = require("luarocks.cfg") | ||
21 | 23 | ||
22 | loader.context = {} | 24 | loader.context = {} |
23 | 25 | ||