[PATCH 2/2] Move dnspython to third_party.

Jeremy Allison jra at samba.org
Wed Nov 12 12:21:11 MST 2014


On Mon, Nov 10, 2014 at 09:40:30AM +0100, Jelmer Vernooij wrote:
> On Sun, Nov 09, 2014 at 08:39:42PM -0800, Jeremy Allison wrote:
> > On Sun, Nov 09, 2014 at 03:06:01PM +0000, Jelmer Vernooij wrote:
> > > Change-Id: I71cb6d6d16a7863d4e5e26bf931cff7d3a9d74c6
> > > Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
> > 
> > There's something about this patchset git
> > doesn't like.
> > 
> > I'm getting:
> > 
> > Applying: Move dnspython to third_party.
> > fatal: corrupt patch at line 17861
> > Patch failed at 0001 Move dnspython to third_party.
> > The copy of the patch that failed is found in:
> >    /home/jeremy/src/samba/git/master/.git/rebase-apply/patch
> > 
> > and if I try and apply that by hand I get:
> > 
> > patching file lib/dnspython/tests/name.py
> > patch: **** malformed patch at line 17225:  \255\255
> > 
> > It *really* doesn't seem to like
> > the \255 bytes :-(.
> 
> I suspect this is just a problem in the patch handling in git that's triggered
> by dnspython. :-(
> 
> Can you try pulling from my git branch at git://git.samba.org/jelmer/samba.git, branch for-review/third-party-dnspython ?

Thanks - got it ! Pushed to autobuild, thanks.


More information about the samba-technical mailing list