summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-05 12:23:34 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-05 12:23:34 -0300
commit57184883c7aa30475d37681d6b88ff0c699e1c7b (patch)
treef443ec0ae2e81d235daff4640468d0c30ae3282a
parent124e1c2b7c9680ca675a5be223208f4bdfcd7720 (diff)
parentf4383108c8613067c5e39aa42f14f40e105a0e25 (diff)
Merge remote-tracking branch 'ivan/bug/3039_registration-error-message' into develop
-rw-r--r--changes/bug_3039-registration-error-message1
-rw-r--r--src/leap/gui/wizard.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/bug_3039-registration-error-message b/changes/bug_3039-registration-error-message
new file mode 100644
index 00000000..ef964d63
--- /dev/null
+++ b/changes/bug_3039-registration-error-message
@@ -0,0 +1 @@
+ o Bugfix: display error message on registration problem. Closes #3039.
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index b29250c8..67ade349 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -304,9 +304,10 @@ class Wizard(QtGui.QWizard):
error_msg = json_content.get("errors").get("login")[0]
if not error_msg.istitle():
error_msg = "%s %s" % (old_username, error_msg)
- self._set_register_status(error_msg, error=True)
except:
logger.error("Unknown error: %r" % (req.content,))
+
+ self._set_register_status(error_msg, error=True)
self.ui.btnRegister.setEnabled(True)
def _set_register_status(self, status, error=False):