From 349517339d7f723903894d51976c9daf77681494 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Thu, 3 Oct 2013 06:16:37 -0400 Subject: [PATCH] Check output of XMPP account registration. --- modules/installed/services/xmpp.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py index 1a8c3d6a4..7965153ef 100644 --- a/modules/installed/services/xmpp.py +++ b/modules/installed/services/xmpp.py @@ -46,8 +46,14 @@ class register(FormPlugin, PagePlugin): if not password: msg.add = _("Must specify a password!") if username and password: - privilegedaction_run("xmpp-register", [username, password]) - msg.add = _("Registered account for %s." % username) + output, error = privilegedaction_run("xmpp-register", [username, password]) + if error: + raise Exception("something is wrong: " + error) + + if "successfully registered" in output: + msg.add = _("Registered account for %s." % username) + else: + msg.add = _("Failed to register account for %s: %o" % (username, output)) cfg.log(msg.text) main = self.main(username, msg=msg.text)