prosody
e21d82551e05
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

prosodyctl @ 8268:e21d82551e05

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 26 Sep 2017 17:24:25 +0100
parent 8253:3a6f5b0f56f0
parent 8265:17ebd8ac8545
child 8285:433b2a41351f
line wrap: on
line diff
--- a/prosodyctl	Thu Sep 21 02:36:28 2017 +0200
+++ b/prosodyctl	Tue Sep 26 17:24:25 2017 +0100
@@ -1030,7 +1030,7 @@
 					suggested_global_modules = set.intersection(suggested_global_modules or set.new(options.modules_enabled), set.new(options.modules_enabled));
 				end
 			end
-			if not suggested_global_modules:empty() then
+			if suggested_global_modules and not suggested_global_modules:empty() then
 				print("    Consider moving these modules into modules_enabled in the global section:")
 				print("    "..tostring(suggested_global_modules / function (x) return ("%q"):format(x) end));
 			end