Mercurial > prosody-hg

diff prosodyctl @ 6501:71b6e8b48a12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 26 Oct 2014 20:57:06 +0100
parents 64146196b142 ce66fe13eebe
children c3a56f8847ac
line wrap: on
line diff
--- a/prosodyctl	Sun Oct 26 16:29:50 2014 +0100
+++ b/prosodyctl	Sun Oct 26 20:57:06 2014 +0100
@@ -552,7 +552,7 @@
 		print("  "..path);
 	end
 	print("");
-	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(luarocks.cfg.program_version or "2.x+")..")")
+	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")")
 		or (pcall(require, "luarocks.require") and "Installed (1.x)")
 		or "Not installed";
 	print("LuaRocks:        ", luarocks_status);