[Bug 263300] Re: Does not work with bzr 1.6
from the bzr NEWS file, 0.90rc1 release:: * RevisionTree.get_weave is now deprecated. Tree.plan_merge is now used for performing annotate-merge. (Aaron Bentley) Unfortunately, the Tree object does not have a plan_merge() method -- Does not work with bzr 1.6 https://bugs.launchpad.net/bugs/263300 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 263300] Re: Does not work with bzr 1.6
It looks like there's a fix on this branch:: http://bazaar.launchpad.net/~menesis/trac-bzr/menesis-dev/revision/50 I'm not sure it's the correct fix, though. I think it's removing functionality to work around the problem. I'm not intimately familiar with either bzr or trac, though, so that might not be a correct assessment. -- Does not work with bzr 1.6 https://bugs.launchpad.net/bugs/263300 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 263300] Re: Does not work with bzr 1.6
Okay, try this patch. It gets ancestry information from the repository instead of from the weave. It stops the tracebacks here. ** Attachment added: "Get ancestry from repo" http://launchpadlibrarian.net/17989677/trac-bzr-get-ancestry.patch -- Does not work with bzr 1.6 https://bugs.launchpad.net/bugs/263300 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
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
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:
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@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
Here's my fix for the problem. The patch handling code in bzrlib is not allowing "junk" before and after the individual patches in the file. This patch makes that code more lenient. This needs to be applied to bzr, not bzr-gtk. If someone knows how to retarget this bug that would help out. ** Attachment added: "bzr-allow-junk-patch.patch" http://launchpadlibrarian.net/38223750/bzr-allow-junk-patch.patch -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
New patch against lp:bzr (looks the same for 2.0.x) that gives parse_patches() and the necessary functions that it calls an allow_dirty parameter. allow_dirty turns on the new behaviour of allowing junk at the beginning and end of individual patches within the patch file. The default is to use the current behaviour. I'll have a patch for bzr- gtk (diff.py and bzr-handle-patch) to set allow_dirty next. Looking at the code in iter_file_patch() I note one thing. The current algorithm allows some non-diff output anywhere if it has special characters in front. You might want to change that as it accepts patches like this: """ === Hey bro! I'm pretendin' to be a dumb patch *** That takes advantage of iter_file_patch()'s # algorithm to parse ... --- bzrlib/patches.py>--2009-11-03 15:45:56 + +++ bzrlib/patches.py>--2010-01-23 17:57:32 + @@ -250,7 +250,13 @@ return shift -def iter_hunks(iter_lines): === === ... something that isn't even a valid patch! # Yep, I can drop text beginning with any of the allowed special chars # in the patch itself! === === +def iter_hunks(iter_lines, allow_dirty=False): +''' +:arg iter_lines: iterable of lines to parse for hunks +:kwarg allow_dirty: If True, when we encounter something that is not +a hunk header when we're looking for one, assume the rest of the lines +are not part of the patch (comments or other junk). Default False +''' hunk = None for line in iter_lines: if line == "\n": """ ** Attachment added: "bzr-allow-dirty.patch" http://launchpadlibrarian.net/38308476/bzr-allow-dirty.patch -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
Patch to bzr-gtk that uses the allow_dirty parameter to bzr to handle patches with comments and other text than bzr puts in. ** Attachment added: "bzr-gtk-bzr-handle-patch-allow-dirty.patch" http://launchpadlibrarian.net/38308517/bzr-gtk-bzr-handle-patch-allow-dirty.patch -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
lp:~toshio/bzr-gtk/handle-patch-fix has become corrupt. New branch lp:~toshio/bzr-gtk/handle-patch-dirty ** Branch linked: lp:~toshio/bzr-gtk/handle-patch-dirty ** Branch unlinked: lp:~toshio/bzr-gtk/handle-dirty-patches -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
** Branch linked: lp:~toshio/bzr/allow-dirty-patches -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
** Branch linked: lp:~toshio/bzr-gtk/handle-dirty-patches -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502076] Re: bzr-handle-patch doesn't like patch files containing "diff" lines before each patch
Two branches proposed for merge. BTW, this seems like a better page for learning how to submit a branch for merge from a bug report: https://help.launchpad.net/Code/BugAndBlueprintLinks it follows the workflow of someone who is starting from fixing an issue in a bug report and links out to the pages needed for explaining how to download and upload a branch from launchpad. The only thing it needs, in fact, is a link to the Merging page that you posted :-( -- 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@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1112496] Re: python-imaging broken in raring
I can't tell if phatch still has this problem from the comments but if needed, here's a patch for it: http://pkgs.fedoraproject.org/cgit/phatch.git/plain/phatch-pillow.patch When Fedora switched over to Pillow about the same time as Ubuntu, a group of us took care of generating all the patches to port code in Fedora to pillow. List of bugs here: https://bugzilla.redhat.com/showdependencytree.cgi?id=894484&hide_resolved=0 We (the patchers) left it up to the package maintainers to submit bugs upstream. So theoretically, closed bugs on the tracker linked above should be upstreams which have accepted the pillow patches while open bugs are ones where Fedora is still carrying the patch locally (again, theoretically). -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1112496 Title: python-imaging broken in raring To manage notifications about this bug go to: https://bugs.launchpad.net/phatch/+bug/1112496/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 129314] Re: Cannot open tgz archive from FreeBSD
If this is the same bug as I'm experiencing using GNU tar on a different system, this tarfile should reproduce the problem: http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz#md5=144f237b615e23f21f6a50b2183aa817 Note that I'm not using Ubuntu -- I just came across this bug report while researching the same error messages and noticed that it lacked a reproducible test file. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/129314 Title: Cannot open tgz archive from FreeBSD To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/tar/+bug/129314/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1182124] Re: [CVE-2013-2099] ssl.match_hostname() trips over crafted wildcard names
Note: there's now a backports module on pypi for this function: https://pypi.python.org/pypi/backports.ssl_match_hostname/ However, it hasn't fixed this CVE upstream as fast as you have :-) -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1182124 Title: [CVE-2013-2099] ssl.match_hostname() trips over crafted wildcard names To manage notifications about this bug go to: https://bugs.launchpad.net/bzr/+bug/1182124/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 271791] Re: Paramiko depends on RandomPool
Jelmer, this hasn't been fixed in paramiko upstream -- did you perhaps mean to change paramiko (Ubuntu) to Fix Committed? ** Changed in: paramiko Status: Fix Committed => Confirmed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/271791 Title: Paramiko depends on RandomPool -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
