Merge lp:~brian-murray/ubuntu-archive-tools/add-release-tasks into lp:ubuntu-archive-tools

[Brian Murray]

Sometimes SRU bugs don't have a release task added, these changes will open a task in that situation.

[lp:~brian-murray/ubuntu-archive-tools/add-release-tasks]

1023. By Brian Murray on 2016-06-02

improve comments

=== modified file 'sru-accept'
--- sru-accept	2014-12-02 17:23:36 +0000
+++ sru-accept	2016-06-02 22:41:22 +0000
@@ -46,6 +46,8 @@
 
 def process_bug(launchpad, options, num):
     bug = launchpad.bugs[num]
+    sourcepkg_match = False
+    distroseries_match = False
 
     for task in bug.bug_tasks:
         # Ugly; we have to do URL-parsing to figure this out.
@@ -57,12 +59,28 @@
              match.group('source') != options.package)):
             print("Ignoring task %s in bug %s" % (task.web_link, num))
             continue
+        sourcepkg_match = True
         if (match.group('suite') in options.targets and
             task.status not in ("Invalid", "Won't Fix", "Fix Committed",
                                 "Fix Released")):
             task.status = "Fix Committed"
             task.lp_save()
             print("Success: task %s in bug %s" % (task.web_link, num))
+            distroseries_match = True
+
+    if sourcepkg_match and not distroseries_match:
+        # add a release task
+        lp_url = launchpad._root_uri
+        for series in options.targets:
+            series_task_url = '%subuntu/%s/+source/%s' % (lp_url, series, options.package)
+            sourcepkg_target = launchpad.load(series_task_url)
+            new_task = bug.addTask(target=sourcepkg_target)
+            new_task.status = "Fix Committed"
+            new_task.lp_save()
+            print("LP: #%s added task for %s %s" % (num, options.package, series))
+    if not sourcepkg_match:
+        # warn that the bug has no source package tasks
+        print("LP: #%s has no %s tasks!" % (num, options.package))
 
     bug.subscribe(person=launchpad.people['ubuntu-sru'])
     bug.subscribe(person=launchpad.people['sru-verification'])
 
=== modified file 'sru-review'
--- sru-review	2016-05-12 06:43:16 +0000
+++ sru-review	2016-06-02 22:41:22 +0000
@@ -237,6 +237,8 @@
     bug = launchpad.bugs[num]
     sourcepkg = upload.package_name
     release = upload.distroseries.name
+    sourcepkg_match = False
+    distroseries_match = False
     for task in bug.bug_tasks:
         # Ugly; we have to do URL-parsing to figure this out.
         # /ubuntu/+source/foo can be fed to launchpad.load() to get a
@@ -247,12 +249,27 @@
              match.group('source') != sourcepkg)):
             print("Ignoring task %s in bug %s" % (task.web_link, num))
             continue
-        if (match.group('suite') == upload.distroseries.name and
+        sourcepkg_match = True
+        if (match.group('suite') == release and
             task.status not in ("Invalid", "Won't Fix", "Fix Committed",
                                 "Fix Released")):
             task.status = "Fix Committed"
             task.lp_save()
             print("Success: task %s in bug %s" % (task.web_link, num))
+            distroseries_match = True
+
+    if sourcepkg_match and not distroseries_match:
+        # add a release task
+        lp_url = launchpad._root_uri
+        series_task_url = '%subuntu/%s/+source/%s' % (lp_url, release, sourcepkg)
+        sourcepkg_target = launchpad.load(series_task_url)
+        new_task = bug.addTask(target=sourcepkg_target)
+        new_task.status = "Fix Committed"
+        new_task.lp_save()
+        print("LP: #%s added task for %s %s" % (num, sourcepkg, release))
+    if not sourcepkg_match:
+        # warn that the bug has no source package tasks
+        print("LP: #%s has no %s tasks!" % (num, sourcepkg))
 
     # XXX: it might be useful if the package signer/sponsor was
     #   subscribed to the bug report