changeset 2797 | 76777fee99b7 |
parent 2789 | 2419ca0bfab3 |
child 2877 | 1edeb8fe7d14 |
--- a/prosody Wed Jan 13 00:04:38 2010 +0000 +++ b/prosody Thu Jan 28 18:10:20 2010 +0000 @@ -31,7 +31,9 @@ end -- Required to be able to find packages installed with luarocks -pcall(require, "luarocks.require") +if not pcall(require, "luarocks.loader") then -- Try LuaRocks 2.x + pcall(require, "luarocks.require") -- Try LuaRocks 1.x +end -- Replace require with one that doesn't pollute _G do