Merge-o-Matic

Merge lp:~vorlon/merge-o-matic/link-to-update-excuses into lp:merge-o-matic

  1. link-to-update-excuses
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 257
Proposed branch: lp:~vorlon/merge-o-matic/link-to-update-excuses
Merge into: lp:merge-o-matic
Diff against target: 14 lines (+3/-1)
1 file modified
merge-status.py (+3/-1)
To merge this branch: bzr merge lp:~vorlon/merge-o-matic/link-to-update-excuses
Reviewer Review Type Date Requested Status
Brian Murray Pending
Review via email: mp+279366@code.launchpad.net

Description of the change

Suggested further enhancement to merges output, link to update_excuses
for packages in -proposed

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

merge-o-matic contains merge-status.py and manual-status.py which contain largely the same content but are run separately. Could you update manual-status.py in the same way? Thanks!

Revision history for this message
Brian Murray (brian-murray) wrote :

I'll just do it so I can update merges.ubuntu.com w/ another change from Mathieu.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'merge-status.py'
2--- merge-status.py 2015-11-30 22:24:29 +0000
3+++ merge-status.py 2015-12-02 22:11:05 +0000
4@@ -368,7 +368,9 @@
5 print("<tr bgcolor=%s>" % COLOURS[colour_idx], file=status)
6 print("<td><small>%s</small></td>" % source["Binary"], file=status)
7 if proposed_version:
8- print("<td>%s (%s)</td>" % (left_version, proposed_version),
9+ excuses_url = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html'
10+ print('<td>%s (<a href="%s#%s">%s</a")</td>' %
11+ (left_version, excuses_url, package, proposed_version),
12 file=status)
13 else:
14 print("<td>%s</td>" % left_version, file=status)

Subscribers

People subscribed via source and target branches

to status/vote changes: