Merge lp:~thekorn/ubuntu-qa-tools/fix-344961-in-multiple-sections-329698-avoid-crashes into lp:ubuntu-qa-tools

[Markus Korn]

[Markus Korn (thekorn)]

Fixes two bugs in the hugday tool:
  - Don't crash on errors, exit with message and error-code instead
    (LP: #329698)
  - mark all tasks as done if there are multiple tasks with the same bug
    id in different sections (LP: #344961)

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-06 13:41:43 +0000
+++ debian/changelog	2009-03-18 20:25:21 +0000
@@ -1,3 +1,13 @@
+ubuntu-qa-tools (0.1.4) UNRELEASED; urgency=low
+
+  * hugday-tools/hugday:
+    - Don't crash on errors, exit with message and error-code instead
+      (LP: #329698)
+    - mark all tasks as done if there are multiple tasks with the same bug
+      id in different sections (LP: #344961)
+
+ -- Markus Korn <[e-mail]>  Wed, 18 Mar 2009 21:22:07 +0100
+
 ubuntu-qa-tools (0.1.3) UNRELEASED; urgency=low
 
   * Changes go here.

=== modified file 'hugday-tools/hugday'
--- hugday-tools/hugday	2009-02-12 18:56:13 +0000
+++ hugday-tools/hugday	2009-03-18 20:25:21 +0000
@@ -331,12 +331,13 @@
     new_data = ""
     if user is None:
         user = config.get("config", "user")
+    closed_bugs = set()
     for line in data:
         if line.startswith("||"):
             ctx = LINE_RE.search(line)
             if ctx:
                 nr = ctx.groups()[0]
-                bugs.remove(nr)
+                closed_bugs.add(nr)
                 cols = line.split("||")
                 triager = cols[3].strip()
                 if "lightgreen" in cols[1] or triager:
@@ -347,8 +348,9 @@
                 cols[3] = " %s " %user
                 line = "||".join(cols)
         new_data += line
+    bugs = set(bugs) - closed_bugs
     if bugs:
-        raise ValueError("One or more bugs can't be found: %s" %bugs)
+        raise ValueError("One or more bugs can't be found: %s" %", ".join(map(str, bugs)))
     data = {
         "button_save": "1",
         "savetext": urllib.quote(new_data),
@@ -408,4 +410,9 @@
         
 
 if __name__ == "__main__":
-    sys.exit(main())
+    try:
+        sys.exit(main())
+    except Exception, e:
+        print "%s: %s" %(e.__class__.__name__, e)
+        sys.exit(1)
+