From 8dffe73a61ecbff7d4c00cdd795d819b81d3f3dd Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 11 Aug 2014 12:09:54 -0300 Subject: Ensure luarocks.loader sees package paths. This should fix a bug reported by @tomasguisasola on 2014-07-07. --- src/bin/luarocks | 1 - src/bin/luarocks-admin | 1 - 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 @@ -- this should be loaded first. local cfg = require("luarocks.cfg") -cfg.init_package_paths() local loader = require("luarocks.loader") 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 @@ -- this should be loaded first. local cfg = require("luarocks.cfg") -cfg.init_package_paths() local loader = require("luarocks.loader") 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 local loader = {} package.loaded["luarocks.loader"] = loader +local cfg = require("luarocks.cfg") +cfg.init_package_paths() + local path = require("luarocks.path") local manif_core = require("luarocks.manif_core") local deps = require("luarocks.deps") -local cfg = require("luarocks.cfg") loader.context = {} -- cgit v1.2.3-55-g6feb