Merge lp:~allenap/launchpad/freedesktop-importance-flip-flop-bug-707478 into lp:launchpad

[Gavin Panella]

[r=gmb][ui=none][bug=707478] bugs.freedesktop.org (Bugzilla 3.4.6) has decided to take notice of the columnlist parameter we pass over.

For some reason bugs.freedesktop.org (Bugzilla 3.4.6) has decided to take notice of the columnlist parameter we pass over. It was incorrect, now it's not :)

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/bugs/externalbugtracker/bugzilla.py'
--- lib/lp/bugs/externalbugtracker/bugzilla.py	2011-01-19 00:10:48 +0000
+++ lib/lp/bugs/externalbugtracker/bugzilla.py	2011-01-27 15:26:48 +0000
@@ -357,7 +357,9 @@
             data = {
                 'form_name': 'buglist.cgi',
                 'bug_id_type': 'include',
-                'columnlist': 'id,product,bug_status,resolution',
+                'columnlist':
+                    ('id,product,bug_status,resolution,'
+                     'priority,bug_severity'),
                 'bug_id': ','.join(bug_ids),
                 }
             if self.version < (2, 17, 1):
@@ -469,10 +471,6 @@
                 self.remote_bug_product[bug_id] = (
                     product_node.childNodes[0].data)
 
-    def initializeRemoteImportance(self, bug_ids):
-        for bug_id in bug_ids:
-            self.remote_bug_importance[bug_id] = "NORMAL NORMAL"
-
     def getRemoteImportance(self, bug_id):
         """See `ExternalBugTracker`."""
         try:
 
=== modified file 'lib/lp/bugs/scripts/checkwatches/remotebugupdater.py'
--- lib/lp/bugs/scripts/checkwatches/remotebugupdater.py	2010-10-26 15:47:24 +0000
+++ lib/lp/bugs/scripts/checkwatches/remotebugupdater.py	2011-01-27 15:26:48 +0000
@@ -132,10 +132,6 @@
             error = None
             oops_id = None
 
-            # XXX: 2007-10-17 Graham Binns
-            #      This nested set of try:excepts isn't really
-            #      necessary and can be refactored out when bug
-            #      136391 is dealt with.
             try:
                 new_remote_status = (
                     self.external_bugtracker.getRemoteStatus(
@@ -179,7 +175,6 @@
                 for bug_watch in bug_watches:
                     bug_watch_updater = BugWatchUpdater(
                         self, bug_watch, self.external_bugtracker)
-
                     bug_watch_updater.updateBugWatch(
                         new_remote_status, new_malone_status,
                         new_remote_importance, new_malone_importance)
@@ -234,4 +229,3 @@
             launchpad_status = BugTaskStatus.UNKNOWN
 
         return launchpad_status
-