Merge lp:~wgrant/launchpad/bug-655648-a-f-maverick into lp:launchpad
Proposed by
William Grant
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Brad Crittenden | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 11726 | ||||
Proposed branch: | lp:~wgrant/launchpad/bug-655648-a-f-maverick | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
76 lines (+10/-10) 5 files modified
lib/lp/archivepublisher/tests/apt-data/Packages (+1/-1) lib/lp/archivepublisher/tests/apt-data/Sources (+1/-1) lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 (+1/-1) lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source (+1/-1) lib/lp/archivepublisher/tests/test_ftparchive.py (+6/-6) |
||||
To merge this branch: | bzr merge lp:~wgrant/launchpad/bug-655648-a-f-maverick | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | code | Approve | |
Steve Kowalik (community) | code* | Approve | |
Review via email: mp+37820@code.launchpad.net |
Commit message
test_ftparchive now works on maverick. - Landed by bac.
Description of the change
maverick's apt-ftparchive has introduced a new level of pedantry -- if a binary file's name is not valid, it will be silently skipped. This causes test_generateConfig to fail.
This branches fixes the apt-ftparchive test files to have valid names, making the test pass on maverick.
To post a comment you must log in.
This looks good, thanks for the clean-up.