[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch

[Toshio Kuratomi]

from the traceback, this looks to be a bug in bzrlib.  I'm not sure how
to retarget this bug there, though:

Summary: TB4b0c976f patches.py:76:get_patch_names:MalformedPatchHeader: Malformed patch header.  No orig name
'diff --git a/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul b/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul\n'

Traceback (most recent call last):
  File "/usr/bin/bzr-handle-patch", line 28, in <module>
    controller = DiffController(path, lines)
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/gtk/diff.py", line 530, in __init__
    self.initialize_window(window)
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/gtk/diff.py", line 534, in initialize_window
    window.diff.set_diff_text_sections(self.get_diff_sections())
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/gtk/diff.py", line 317, in set_diff_text_sections
    for oldname, newname, patch in sections:
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/gtk/diff.py", line 539, in get_diff_sections
    for patch in parse_patches(self.patch):
  File "/usr/lib/python2.6/site-packages/bzrlib/patches.py", line 401, in parse_patches
    return [parse_patch(f.__iter__()) for f in iter_file_patch(iter_lines)]
  File "/usr/lib/python2.6/site-packages/bzrlib/patches.py", line 345, in parse_patch
    (orig_name, mod_name) = get_patch_names(iter_lines)
  File "/usr/lib/python2.6/site-packages/bzrlib/patches.py", line 76, in get_patch_names
    raise MalformedPatchHeader("No orig name", line)
MalformedPatchHeader: Malformed patch header.  No orig name
'diff --git a/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul b/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul\n'

Local variables in innermost frame:
iter_lines: <generator object iter_lines_handle_nl at 0x8bdfdc4>
line: diff --git a/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul b/funambol-mozilla-plugin/extension/chrome/content/funambol/funambol-preferences-linux.xul

match: None

Downstream bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=557573

** Bug watch added: Red Hat Bugzilla #557573
   https://bugzilla.redhat.com/show_bug.cgi?id=557573

-- 
bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
https://bugs.launchpad.net/bugs/502076
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs