bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Martin Pool | ||
Bazaar GTK+ Frontends |
Fix Released
|
Medium
|
Unassigned | ||
bzr (Fedora) |
Won't Fix
|
Medium
|
|||
bzr (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
Binary package hint: bzr-gtk
As bzr-handle-patch registers itself for .patch files, Firefox offers to use it when I click on a .patch as can be found on the Debian PTS (links to the patches on http://
Malformed patch header. No orig name
'diff -pruN 1.2.4-1/
The patch itself looks as following:
diff -pruN 1.2.4-1/
--- 1.2.4-1/
+++ 1.2.4-1ubuntu1/
@@ -1,3 +1,11 @@
[...]
If I remove the offending "diff" lines from the whole patch, bzr-handle-patch can open it then.
As creating patch files with "diff -ruN" (or even "diff -pruN") is pretty common, bzr-handle-patch should cope with them (if it registers itself for those files).
Related branches
- Martin Pool: Approve
-
Diff: 113 lines (+53/-8)1 file modifiedbzrlib/patches.py (+53/-8)
- Bazaar GTK maintainers: Pending requested
-
Diff: 50 lines (+10/-3)2 files modifiedbzr-handle-patch (+1/-1)
diff.py (+9/-2)
affects: | bzr-gtk (Ubuntu) → bzr (Ubuntu) |
Changed in bzr: | |
status: | New → In Progress |
importance: | Undecided → Medium |
tags: | added: patch |
tags: |
added: patch-needswork removed: patch |
Changed in bzr: | |
assignee: | nobody → Martin Pool (mbp) |
tags: |
added: patch-forwarded-upstream removed: patch-needswork |
Changed in bzr-gtk: | |
status: | In Progress → Fix Released |
importance: | Undecided → Medium |
Changed in bzr (Fedora): | |
importance: | Unknown → Medium |
status: | Unknown → Won't Fix |
abrt 1.0.3 detected a crash.
How to reproduce: Try to open the patch file from https:/ /mozilla- plugin. forge.funambol. org/servlets/ TrackerDownload /remcurreport/ true/template/ ViewAttachment. vm/attachid/ 453/filename/ 0001-fix- preferences. patch and you will get the attached crash. bzr-handle- patch /home/fm/ 0001-fix- preferences. patch bzr-handle- patch 9-174.fc12. i686.PAE 0.97.0- 2.fc12
Attached file: backtrace
cmdline: /usr/bin/python /usr/bin/
component: bzr-gtk
executable: /usr/bin/
kernel: 2.6.31.
package: bzr-gtk-
uuid: 4b0c976f