Diff

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
line wrap: on
line diff
--- a/prosodyctl	Fri May 07 16:47:58 2021 +0200
+++ b/prosodyctl	Thu May 13 11:17:13 2021 +0100
@@ -466,6 +466,7 @@
 		ssl = "LuaSec";
 	};
 	local lunbound = dependencies.softreq"lunbound";
+	local lxp = dependencies.softreq"lxp";
 	for name, module in pairs(package.loaded) do
 		if type(module) == "table" and rawget(module, "_VERSION")
 			and name ~= "_G" and not name:match("%.") then
@@ -486,6 +487,9 @@
 		end
 		library_versions["libunbound"] = lunbound._LIBVER;
 	end
+	if lxp then
+		library_versions["libexpat"] = lxp._EXPAT_VERSION;
+	end
 	for name, version in sorted_pairs(module_versions) do
 		print(name..":"..string.rep(" ", longest_name-#name), version);
 	end