Merge lp:~broder/ubuntu-archive-tools/backport-helper-requestor into lp:ubuntu-archive-tools

[Evan Broder]

Colin pointed out that the requestor for a backport should be the member of ubuntu-backporters that approved the backport, not the person who requested the backport initially. This updates backport-helper.py to try and extract that from the bug's history, with the ability for the user to override that detection.

[Colin Watson (cjwatson)]

Seems to work well, thanks!

review: Approve

=== modified file 'backport-helper.py'
--- backport-helper.py	2010-12-06 18:00:40 +0000
+++ backport-helper.py	2010-12-11 23:21:57 +0000
@@ -13,6 +13,7 @@
 
 valid_series = set()
 backporters = set()
+lp = None
 
 
 def rmadison(distro, package):
@@ -62,12 +63,20 @@
         for m in reversed(bugtask.bug.messages):
             self.content += '\n=============================================\n'
             star = ''
-            if m.owner in backporters:
+            if m.owner.name in backporters:
                 star = '(*)'
             self.content += '%s%s said %s on %s:\n\n' % (m.owner.name, star,
                                                          m.subject, str(m.date_created))
             self.content += m.content
 
+        self.requestor = None
+        for a in reversed(bugtask.bug.activity):
+            if (a.whatchanged == '%s: status' % bugtask.bug_target_name and
+                a.newvalue == 'In Progress' and
+                a.person.name in backporters):
+                self.requestor = a.person
+                break
+
     # All setters return True if the input was valid
     def setPackage(self, value):
         self.package = value
@@ -95,8 +104,15 @@
             return True
         return False
 
+    def setRequestor(self, value):
+        try:
+            self.requestor = lp.people[value]
+            return True
+        except KeyError:
+            return False
+
     def valid(self):
-        return self.package and self.source and self.dest
+        return self.package and self.source and self.dest and self.requestor
 
     def validSuite(self, suite):
         return suite.split('-')[0] in valid_series
@@ -106,15 +122,16 @@
                   'fromsuite': self.source,
                   'tosuite': self.dest,
                   'package': self.package,
-                  'requestor': self.reporter.name}
+                  'requestor': self.requestor.name}
         f.write('backport %(number)s -b %(requestor)s -S %(fromsuite)s -s %(tosuite)s %(package)s\n' % params)
 
     def __str__(self):
-        return '#%d (%s: %s -> %s) %s' % (self.number,
-                                          self.package if self.package else 'unknown package',
-                                          self.source if self.source else 'unknown',
-                                          self.dest if self.dest else 'unknown',
-                                          self.title)
+        return '#%d (%s: %s -> %s, from %s) %s' % (self.number,
+                                                   self.package if self.package else 'unknown package',
+                                                   self.source if self.source else 'unknown',
+                                                   self.dest if self.dest else 'unknown',
+                                                   self.requestor.name if self.requestor else 'unknown',
+                                                   self.title)
 
 def length(collection):
     # XXX: Workaround bug 274074. Thanks wgrant.
@@ -135,7 +152,7 @@
 
 
 def main(args=None):
-    global valid_series, backporters
+    global valid_series, backporters, lp
 
     options, args = parse_options(args[1:])
 
@@ -153,6 +170,7 @@
     bp_team = lp.people['ubuntu-backporters']
     backporters = set(bp_team.getMembersByStatus(status='Approved')).union(
         bp_team.getMembersByStatus(status='Administrator'))
+    backporters = set(bp.name for bp in backporters)
     pillar = lp.projects['ubp']
     subscriber = lp.people['ubuntu-archive']
 
@@ -189,7 +207,7 @@
             msg = '[Show/sKip/'
             if bug.valid():
                 msg += 'process Backport/'
-            msg += 'set Package/set sOurce series/set Dest series/opEn bug]: '
+            msg += 'set Package/set sOurce series/set Dest series/set Requestor/opEn bug]: '
             sys.stdout.write(msg)
             sys.stdout.flush()
             ret = sys.stdin.readline().rstrip().upper()
@@ -213,6 +231,9 @@
             elif ret == 'D':
                 if not bug.setDest(raw_input('New dest series? ')):
                     print 'Invalid series'
+            elif ret == 'R':
+                if not bug.setRequestor(raw_input('New requestor? ')):
+                    print 'Invalid requestor'
             elif ret == 'E':
                 webbrowser.open('https://bugs.launchpad.net/bugs/%s' % bug.number)
             else: