diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:57:06 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:57:06 +0100 |
| commit | 8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9 (patch) | |
| tree | c65d04b1647b92c2b09d1697a9c61d39485c1b09 /prosodyctl | |
| parent | 58138b1fd556ab505da50b7d33632cccfc9d5606 (diff) | |
| parent | f5913a9c3d442038e7146df18d5b3914b2d07175 (diff) | |
| download | prosody-8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9.tar.gz prosody-8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9.zip | |
Merge 0.9->0.10
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -552,7 +552,7 @@ function commands.about(arg) 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); |