aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2014-08-11 12:09:54 -0300
committerHisham Muhammad <hisham@gobolinux.org>2014-08-11 12:12:13 -0300
commit8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd (patch)
tree037fa7ae15b9346fa5f890e92f00b9f47d36aa78
parentfa6863a19d3dd40c43975ffb4b3384d9cad40228 (diff)
downloadluarocks-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-xsrc/bin/luarocks1
-rwxr-xr-xsrc/bin/luarocks-admin1
-rw-r--r--src/luarocks/loader.lua4
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.
4local cfg = require("luarocks.cfg") 4local cfg = require("luarocks.cfg")
5cfg.init_package_paths()
6 5
7local loader = require("luarocks.loader") 6local loader = require("luarocks.loader")
8local command_line = require("luarocks.command_line") 7local 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.
4local cfg = require("luarocks.cfg") 4local cfg = require("luarocks.cfg")
5cfg.init_package_paths()
6 5
7local loader = require("luarocks.loader") 6local loader = require("luarocks.loader")
8local command_line = require("luarocks.command_line") 7local 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
14local loader = {} 14local loader = {}
15package.loaded["luarocks.loader"] = loader 15package.loaded["luarocks.loader"] = loader
16 16
17local cfg = require("luarocks.cfg")
18cfg.init_package_paths()
19
17local path = require("luarocks.path") 20local path = require("luarocks.path")
18local manif_core = require("luarocks.manif_core") 21local manif_core = require("luarocks.manif_core")
19local deps = require("luarocks.deps") 22local deps = require("luarocks.deps")
20local cfg = require("luarocks.cfg")
21 23
22loader.context = {} 24loader.context = {}
23 25