patch parser does not accept headers with CRLF line-endings
Bug #453010 reported by
Данило Шеган
This bug affects 3 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Low
|
Unassigned | ||
| Launchpad itself |
Fix Released
|
High
|
Unassigned | ||
Bug Description
I've used bzr send --no-bundle to prepare a merge proposal, and I got an OOPS email back:
"Launchpad encountered an internal error during the following operation: creating a merge proposal from message with subject [MERGE] Improve CSS in two different places.. It was logged with id OOPS-1385CMP1. Sorry for the inconvenience."
I am attaching a full email (including body, not just the attached patch) for your investigation.
OOPS-1385CMP1 OOPS-1385CMP2
Related branches
lp:~abentley/launchpad/ignore-md-diff
- Francis J. Lacoste (community): Approve (release-critical)
- Abel Deuring (community): Approve (code)
-
Diff: 51 lines2 files modifiedlib/lp/code/mail/codehandler.py (+1/-17)
lib/lp/code/mail/tests/test_codehandler.py (+1/-1)
Revision history for this message
| Данило Шеган (danilo) wrote | #1 |
| summary: |
- MalformedHunkHeader: Malformed hunk header. Does not match format. '@@ - -5,6 +5,7 @@\\r\\n' + MalformedHunkHeader: Malformed hunk header. Does not match format. |
| summary: |
- MalformedHunkHeader: Malformed hunk header. Does not match format. + patch parser does not accept headers with CRLF line-endings |
Revision history for this message
| Aaron Bentley (abentley) wrote | #2 |
Revision history for this message
| Aaron Bentley (abentley) wrote | #3 |
| Changed in launchpad-code: | |
| status: | New → Triaged |
| importance: | Undecided → High |
Revision history for this message
| Данило Шеган (danilo) wrote | #4 |
Revision history for this message
| Aaron Bentley (abentley) wrote | #5 |
| Changed in launchpad-code: | |
| status: | Triaged → Fix Released |
| tags: | added: patch |
| Changed in bzr: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
| tags: | added: check-for-breezy |
To post a comment you must log in.
I can't quite figure out why the diff contains CRLF's in the first place. Perhaps they were added by Evolution before it base64-encoded the merge directive?
And why did evo base64-encode it anyway? All the characters in the merge directive are ascii.