Raise login errors from XMLRPC (bz 1086879)

crobinso · crobinso · commit 2e36c4092bf6 · 2014-04-11T16:16:16.000-04:00
So you actually get warnings when your account is locked
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -1138,11 +1138,12 @@ def main(bzinstance=None):
             global_opt.password = getpass.getpass()
         sys.stdout.write('Logging in... ')
         sys.stdout.flush()
-        if bz.login(global_opt.user, global_opt.password):
+        try:
+            bz.login(global_opt.user, global_opt.password)
             print('Authorization cookie received.')
             sys.exit(0)
-        else:
-            print('failed.')
+        except bugzilla.BugzillaError:
+            print(str(sys.exc_info()[1]))
             sys.exit(1)
 
     # Set up authentication
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -474,7 +474,8 @@ def login(self, user=None, password=None):
         logged_in attribute to True, if successful.
 
         If user is not set, the value of Bugzilla.user will be used. If *that*
-        is not set, ValueError will be raised.
+        is not set, ValueError will be raised. If login fails, BugzillaError
+        will be raised.
 
         This method will be called implicitly at the end of connect() if user
         and password are both set. So under most circumstances you won't need
@@ -491,14 +492,14 @@ def login(self, user=None, password=None):
             raise ValueError("missing password")
 
         try:
-            r = self._login(self.user, self.password)
+            ret = self._login(self.user, self.password)
             self.logged_in = True
-            log.info("login successful - dropping password from memory")
             self.password = ''
+            log.info("login successful for user=%s", self.user)
+            return ret
         except Fault:
-            r = False
-
-        return r
+            e = sys.exc_info()[1]
+            raise BugzillaError("Login failed: %s" % str(e.faultString))
 
     def logout(self):
         '''Log out of bugzilla. Drops server connection and user info, and
