Attachment 593002 Details for Bug 639605 – Collect bug lookup errors and keep going

Collect bug lookup errors and keep going

bodhi-collect-bug-lookup-errors.patch (text/plain), 2.94 KB, created by Cole Robinson on 2012-06-19 16:16:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cole Robinson

Created: 2012-06-19 16:16:19 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/bodhi/controllers.py b/bodhi/controllers.py
>index 674c9ae..9d483a9 100644
>--- a/bodhi/controllers.py
>+++ b/bodhi/controllers.py
>@@ -1024,11 +1024,10 @@ class Root(controllers.RootController):
>             try:
>                 original_bugs = [bug.bz_id for bug in update.bugs]
>                 update.update_bugs(bugs)
>-            except xmlrpclib.Fault, f:
>-                log.exception(f)
>+            except ValueError:
>                 note.insert(0, "Unable to access one or more bugs: %s" % f.faultString)
>             except Exception, e:
>-                log.error("Unknown exception thrown from python-bugzilla!")
>+                log.error("Unknown exception thrown while updating bug list!")
>                 note.insert(0, "Unable to access one or more bugs.  Exception: %s" % e)
> 
>             # If there are any security bugs, make sure this update is
>diff --git a/bodhi/model.py b/bodhi/model.py
>index 090457d..f5df03e 100644
>--- a/bodhi/model.py
>+++ b/bodhi/model.py
>@@ -758,25 +758,35 @@ class PackageUpdate(SQLObject):
>                 if len(bug.updates) == 0:
>                     log.debug("Destroying stray Bugzilla #%d" % bug.bz_id)
>                     bug.destroySelf()
>+
>+        errors = []
>         for bug in bugs:
>             try:
>-                bug = int(bug)
>-            except ValueError: # bug alias
>-                bugzilla = Bugzilla.get_bz()
>-                bug = bugzilla.getbug(bug).bug_id
>-            try:
>-                bz = Bugzilla.byBz_id(bug)
>-            except SQLObjectNotFound:
>-                if fetchdetails:
>+                try:
>+                    bug = int(bug)
>+                except ValueError: # bug alias
>                     bugzilla = Bugzilla.get_bz()
>-                    newbug = bugzilla.getbug(bug)
>-                    bz = Bugzilla(bz_id=newbug.bug_id)
>-                    bz.fetch_details(newbug)
>-                    bz.modified()
>-                else:
>-                    bz = Bugzilla(bz_id=int(bug))
>-            if bz not in self.bugs:
>-                self.addBugzilla(bz)
>+                    bug = bugzilla.getbug(bug).bug_id
>+                try:
>+                    bz = Bugzilla.byBz_id(bug)
>+                except SQLObjectNotFound:
>+                    if fetchdetails:
>+                        bugzilla = Bugzilla.get_bz()
>+                        newbug = bugzilla.getbug(bug)
>+                        bz = Bugzilla(bz_id=newbug.bug_id)
>+                        bz.fetch_details(newbug)
>+                        bz.modified()
>+                    else:
>+                        bz = Bugzilla(bz_id=int(bug))
>+                if bz not in self.bugs:
>+                    self.addBugzilla(bz)
>+            except xmlrpclib.Fault, f:
>+                # Try to keep going if we failed to lookup a bz
>+                log.exception(f)
>+                errors.append(f.faultString)
>+
>+        if errors:
>+            raise ValueError(" ".join(errors))
> 
>     def update_cves(self, cves):
>         """

Actions: View

Attachments on bug 639605: 593002