Software / code / prosody
Comparison
prosodyctl @ 6501:71b6e8b48a12
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 26 Oct 2014 20:57:06 +0100 |
| parent | 6486:64146196b142 |
| parent | 6498:ce66fe13eebe |
| child | 6584:c3a56f8847ac |
comparison
equal
deleted
inserted
replaced
| 6495:44df423f8290 | 6501:71b6e8b48a12 |
|---|---|
| 550 print("Lua C module search paths:"); | 550 print("Lua C module search paths:"); |
| 551 for path in package.cpath:gmatch("[^;]+") do | 551 for path in package.cpath:gmatch("[^;]+") do |
| 552 print(" "..path); | 552 print(" "..path); |
| 553 end | 553 end |
| 554 print(""); | 554 print(""); |
| 555 local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(luarocks.cfg.program_version or "2.x+")..")") | 555 local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")") |
| 556 or (pcall(require, "luarocks.require") and "Installed (1.x)") | 556 or (pcall(require, "luarocks.require") and "Installed (1.x)") |
| 557 or "Not installed"; | 557 or "Not installed"; |
| 558 print("LuaRocks: ", luarocks_status); | 558 print("LuaRocks: ", luarocks_status); |
| 559 print(""); | 559 print(""); |
| 560 print("# Lua module versions"); | 560 print("# Lua module versions"); |