Merge lp:~brian-murray/ubuntu-archive-tools/sru-accept-web-links into lp:ubuntu-archive-tools

[Brian Murray]

sru-accept.py prints out information about the tasks that it modified however those links have api.somethingsomething which won't work in a browser. I changed to using task.web_link which will.

[Colin Watson (cjwatson)]

LGTM, modulo conflicts in sru-report (which I'll resolve).

review: Approve

=== modified file 'sru-accept.py'
--- sru-accept.py	2012-04-26 16:38:48 +0000
+++ sru-accept.py	2012-06-01 19:44:18 +0000
@@ -59,13 +59,13 @@
         match = bug_target_re.search(task.target.self_link)
         if (not match or
             (options.package and match.group('source') != options.package)):
-            print("Ignoring task %s in bug %s" % (task.target, num))
+            print("Ignoring task %s in bug %s" % (task.web_link, num))
             continue
         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.target, num))
+            print("Success: task %s in bug %s" % (task.web_link, num))
 
     bug.subscribe(person=launchpad.people['ubuntu-sru'])
     bug.subscribe(person=launchpad.people['sru-verification'])

=== modified file 'sru-report'
--- sru-report	2012-06-01 15:32:20 +0000
+++ sru-report	2012-06-01 19:44:18 +0000
@@ -364,8 +364,13 @@
 def get_queue_count(search_status, release, search_pocket):
     '''Return number of results of given queue page URL'''
 
+<<<<<<< TREE
     count = len(release.getPackageUploads(status=search_status,
         archive=archive, pocket=search_pocket))
+=======
+    count = int(release.getPackageUploads(status=search_status,
+        pocket=search_pocket)._wadl_resource.representation['total_size'])
+>>>>>>> MERGE-SOURCE
     return count