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 | 29326acffa1d582bed7759e6302d2c4b4bced884 (patch) | |
| tree | c65d04b1647b92c2b09d1697a9c61d39485c1b09 /prosodyctl | |
| parent | d0cb0b35d5e1d3d12bf07610330c93e55eae086a (diff) | |
| parent | 5d050ae1e6ad245debbc3f644680c99dd50932c5 (diff) | |
| download | prosody-29326acffa1d582bed7759e6302d2c4b4bced884.tar.gz prosody-29326acffa1d582bed7759e6302d2c4b4bced884.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); |