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

Proposed by Brian Murray
Status: Merged
Merged at revision: 471
Proposed branch: lp:~brian-murray/ubuntu-archive-tools/sru-accept-web-links
Merge into: lp:ubuntu-archive-tools
Diff against target: 35 lines (+7/-2) (has conflicts)
2 files modified
sru-accept.py (+2/-2)
sru-report (+5/-0)
Text conflict in sru-report
To merge this branch: bzr merge lp:~brian-murray/ubuntu-archive-tools/sru-accept-web-links
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+108409@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sru-accept.py'
2--- sru-accept.py 2012-04-26 16:38:48 +0000
3+++ sru-accept.py 2012-06-01 19:44:18 +0000
4@@ -59,13 +59,13 @@
5 match = bug_target_re.search(task.target.self_link)
6 if (not match or
7 (options.package and match.group('source') != options.package)):
8- print("Ignoring task %s in bug %s" % (task.target, num))
9+ print("Ignoring task %s in bug %s" % (task.web_link, num))
10 continue
11 if (match.group('suite') in options.targets and
12 task.status not in ("Invalid", "Won't Fix", "Fix Committed", "Fix Released")):
13 task.status = "Fix Committed"
14 task.lp_save()
15- print("Success: task %s in bug %s" % (task.target, num))
16+ print("Success: task %s in bug %s" % (task.web_link, num))
17
18 bug.subscribe(person=launchpad.people['ubuntu-sru'])
19 bug.subscribe(person=launchpad.people['sru-verification'])
20
21=== modified file 'sru-report'
22--- sru-report 2012-06-01 15:32:20 +0000
23+++ sru-report 2012-06-01 19:44:18 +0000
24@@ -364,8 +364,13 @@
25 def get_queue_count(search_status, release, search_pocket):
26 '''Return number of results of given queue page URL'''
27
28+<<<<<<< TREE
29 count = len(release.getPackageUploads(status=search_status,
30 archive=archive, pocket=search_pocket))
31+=======
32+ count = int(release.getPackageUploads(status=search_status,
33+ pocket=search_pocket)._wadl_resource.representation['total_size'])
34+>>>>>>> MERGE-SOURCE
35 return count
36
37

Subscribers

People subscribed via source and target branches