Software / code / prosody
Comparison
prosodyctl @ 11560:3bbb1af92514
Merge 0.11->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 13 May 2021 11:17:13 +0100 |
| parent | 11301:d7f0dc727a47 |
| parent | 11552:d4b735272a61 |
| child | 11563:0983653cbfdf |
comparison
equal
deleted
inserted
replaced
| 11538:30feeb4d9d0b | 11560:3bbb1af92514 |
|---|---|
| 464 lxp = "LuaExpat"; | 464 lxp = "LuaExpat"; |
| 465 socket = "LuaSocket"; | 465 socket = "LuaSocket"; |
| 466 ssl = "LuaSec"; | 466 ssl = "LuaSec"; |
| 467 }; | 467 }; |
| 468 local lunbound = dependencies.softreq"lunbound"; | 468 local lunbound = dependencies.softreq"lunbound"; |
| 469 local lxp = dependencies.softreq"lxp"; | |
| 469 for name, module in pairs(package.loaded) do | 470 for name, module in pairs(package.loaded) do |
| 470 if type(module) == "table" and rawget(module, "_VERSION") | 471 if type(module) == "table" and rawget(module, "_VERSION") |
| 471 and name ~= "_G" and not name:match("%.") then | 472 and name ~= "_G" and not name:match("%.") then |
| 472 name = friendly_names[name] or name; | 473 name = friendly_names[name] or name; |
| 473 if #name > longest_name then | 474 if #name > longest_name then |
| 483 if lunbound then | 484 if lunbound then |
| 484 if not module_versions["luaunbound"] then | 485 if not module_versions["luaunbound"] then |
| 485 module_versions["luaunbound"] = "0.5 (?)"; | 486 module_versions["luaunbound"] = "0.5 (?)"; |
| 486 end | 487 end |
| 487 library_versions["libunbound"] = lunbound._LIBVER; | 488 library_versions["libunbound"] = lunbound._LIBVER; |
| 489 end | |
| 490 if lxp then | |
| 491 library_versions["libexpat"] = lxp._EXPAT_VERSION; | |
| 488 end | 492 end |
| 489 for name, version in sorted_pairs(module_versions) do | 493 for name, version in sorted_pairs(module_versions) do |
| 490 print(name..":"..string.rep(" ", longest_name-#name), version); | 494 print(name..":"..string.rep(" ", longest_name-#name), version); |
| 491 end | 495 end |
| 492 print(""); | 496 print(""); |