Merge lp:~jelmer/launchpad/635591-sync-source-unicode into lp:launchpad
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Robert Collins |
Approved revision: | no longer in the source branch. |
Merged at revision: | 11565 |
Proposed branch: | lp:~jelmer/launchpad/635591-sync-source-unicode |
Merge into: | lp:launchpad |
Diff against target: |
62 lines (+27/-1) 2 files modified
lib/lp/soyuz/scripts/ftpmaster.py (+1/-1) lib/lp/soyuz/scripts/tests/test_sync_source.py (+26/-0) |
To merge this branch: | bzr merge lp:~jelmer/launchpad/635591-sync-source-unicode |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Collins (community) | Approve | ||
Launchpad code reviewers | code | Pending | |
Review via email: mp+35715@code.launchpad.net |
Commit message
Fix handling of empty lines in sync source (regression from fix for bug 635591).
Description of the change
I found an issue with my fix for bug 635591 when I QA'ed it.
If the changelog entry contains white lines then no new fields will be parsed. Since the Files section was added after the Changes section this meant that the Files section would be ignored in some cases.
This branch adds a test for changelog entries with empty lines and moves the Files section up in the file to cope with this bug.
To post a comment you must log in.
FWIW, I'm also filing a bug against python-debian about this issue.