fedora-accounts bz-make-components-pkgdb.py,1.6,1.7

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv736

Modified Files:
	bz-make-components-pkgdb.py 
Log Message:
Update for changes introduced by bugzilla migration.
Check for problems at the protocol layer as well as with the xmlrpc call.



Index: bz-make-components-pkgdb.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/bz-make-components-pkgdb.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bz-make-components-pkgdb.py	23 Aug 2007 22:22:10 -0000	1.6
+++ bz-make-components-pkgdb.py	25 Aug 2007 18:45:10 -0000	1.7
@@ -13,7 +13,7 @@
 
 # Set this to the production bugzilla account when we're ready to go live
 BZSERVER = 'https://bugdev.devel.redhat.com/bugzilla-cvs/xmlrpc.cgi'
-#BZSERVER = 'https://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
+#BZSERVER = 'https://bugzilla.redhat.com/xmlrpc.cgi'
 BZUSER=''
 BZPASS=''
 
@@ -83,8 +83,16 @@
             product = self.productCache[collection]
         except KeyError:
             product = {}
-            components = self.server.bugzilla.getProdCompDetails(collection,
-                    self.username, self.password)
+            try:
+                components = self.server.bugzilla.getProdCompDetails(collection,
+                                self.username, self.password)
+            except xmlrpclib.Fault, e:
+                # Output something useful in args
+                e.args = (e.faultCode, e.faultString)
+                raise
+            except xmlrpclib.ProtocolError, e:
+                e.args = ('ProtocolError', e.errcode, e.errmsg)
+                raise
 
             # This changes from the form:
             #   {'component': 'PackageName',
@@ -164,6 +172,9 @@
                         # Output something useful in args
                         e.args = (data, e.faultCode, e.faultString)
                         raise
+                    except xmlrpclib.ProtocolError, e:
+                        e.args = ('ProtocolError', e.errcode, e.errmsg)
+                        raise
         else:
             # Add component
             owner = self._get_bugzilla_email(owner).lower()
@@ -233,6 +244,11 @@
                 # A Package or Collection was returned via xmlrpc but wasn't
                 # present when we tried to change it
                 errors.append(str(e.args))
+            except xmlrpclib.ProtocolError, e:
+                # Unrecoverable and likely means that nothing is going to
+                # succeed.
+                errors.append(str(e.args))
+                break
             except xmlrpclib.Error, e:
                 # An error occurred in the xmlrpc call.  Shouldn't happen but
                 # we better see what it is