On Sat, Feb 13, 2016 at 06:20:01PM +0100, Andreas Enge wrote:
> On Sat, Feb 13, 2016 at 06:01:19PM +0100, Pjotr Prins wrote:
> > cat 0001-gnu-Add-slurm.patch |patch -p1  # same patch, different name
> > patching file gnu/packages/parallel.scm
> > patching file 
> > gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
> > Works fine. Maybe because I used an attachment previously?
> 
> No, that should not be a problem (after I removed the first line ">From..."
> of the attachment). I still get:
> 
> patching file gnu/packages/parallel.scm
> Hunk #1 FAILED at 2.
> 1 out of 3 hunks FAILED -- saving rejects to file 
> gnu/packages/parallel.scm.rej
> patching file 
> gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
> 
> The thing that does not work is adding your copyright line. Very strange;
> we seem to have the same white-space in the file.

I had the same issue with some of Jan's patches yesterday.

I used diffoscope to compare the non-working patch and a "should-be"
identical patch that I generated locally. The only differences were in
the patch headers and the encoding of the file (UTF-8 vs ISO-8859-1).

I couldn't figure out why these differences would matter and moved on,
but it's disturbing that others are hitting the same issue!

Reply via email to