From 1ab3297faae3e57772c840d74828a9d370a6cd84 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 2 Aug 2018 13:48:01 -0300 Subject: Fix: do not detect .luarocks/config-5.x.lua and lua_modules as modules Running luarocks init a second time after deleting the rockspec was mis-detects .luarocks/config-5.x.lua as a module, creating an entry `["luarocks.config-5.3"] = ".luarocks/config-5.3.lua"` in `build.modules`. Same problem happened with modules under `lua_modules`. This excludes `.luarocks` and `lua_modules` from module detection. Includes a regression test. Closes #847. --- src/luarocks/build/builtin.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index 694542ba..2db6f256 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua @@ -89,7 +89,9 @@ do for _, file in ipairs(fs.find()) do local luamod = file:match("(.*)%.lua$") - if luamod and not luamod_blacklist[luamod] then + if file:match("^.luarocks") or file:match("^lua_modules") then + -- skip + elseif luamod and not luamod_blacklist[luamod] then modules[path.path_to_module(file)] = prefix..file else local cmod = file:match("(.*)%.c$") -- cgit v1.2.3-55-g6feb