From 15fb8092199a74af4da602d2c93ca3f0a825d21e Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 28 Jan 2010 18:10:20 +0000 Subject: util.dependencies: Load luarocks.loader/luarocks.require --- prosody | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'prosody') diff --git a/prosody b/prosody index e4e5bc47..40aeac5e 100755 --- a/prosody +++ b/prosody @@ -31,7 +31,9 @@ if CFG_DATADIR then 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 -- cgit v1.2.3