# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1264702220 0
# Node ID 76777fee99b7b8fef1ac8de20dce54e9bd52bebe
# Parent  1e287badd033edde73c84604a62628f5e0ddb859
util.dependencies: Load luarocks.loader/luarocks.require

diff -r 1e287badd033 -r 76777fee99b7 prosody
--- 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