Merge lp://staging/~wgrant/launchpad/bug-685401-expired-queue-files into lp://staging/launchpad
Proposed by
William Grant
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Tim Penhey | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 12114 | ||||||||
| Proposed branch: | lp://staging/~wgrant/launchpad/bug-685401-expired-queue-files | ||||||||
| Merge into: | lp://staging/launchpad | ||||||||
| Diff against target: |
133 lines (+34/-20) 3 files modified
lib/canonical/launchpad/scripts/logger.py (+1/-1) lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt (+10/-3) lib/lp/soyuz/templates/distroseries-queue.pt (+23/-16) |
||||||||
| To merge this branch: | bzr merge lp://staging/~wgrant/launchpad/bug-685401-expired-queue-files | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | Approve | ||
| Steve Kowalik (community) | code* | Approve | |
|
Review via email:
|
|||
Commit message
[r=stevenk,
Description of the change
Files related to a PackageUpload can be expired once the upload is processed (translations tarballs are occasionally manually expired, and binaries are expired after a series' obsolescence). DistroSeries:+queue doesn't handle this case, crashing when it attempts to display the file size.
This branch fixes +queue to not link to nor attempt to show the size of expired files. I've slightly augmented an existing doctest to verify this behaviour.
To post a comment you must log in.
Revision history for this message
| William Grant (wgrant) wrote | # |
Revision history for this message
| Steve Kowalik (stevenk) | # |
review:
Approve
(code*)
Revision history for this message
| Tim Penhey (thumper) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Oh, I also threw in a python2.7 fix for canonical.