From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Add slurm. Date: Sat, 13 Feb 2016 15:13:37 -0500 Message-ID: <20160213201337.GA9218@jasmine> References: <20160211081534.GA8987@thebird.nl> <20160212122042.GA14275@thebird.nl> <20160212123010.GA6019@debian.eduroam.u-bordeaux.fr> <20160212123141.GB14324@thebird.nl> <20160212125719.GA14615@thebird.nl> <20160213085940.GA18223@thebird.nl> <20160213102825.GA19194@debian> <20160213164257.GA19241@thebird.nl> <20160213170119.GA19344@thebird.nl> <20160213172001.GA3956@debian> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUgZV-0003wC-Sa for guix-devel@gnu.org; Sat, 13 Feb 2016 15:13:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUgZS-00079M-Jc for guix-devel@gnu.org; Sat, 13 Feb 2016 15:13:37 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUgZS-00079G-Fg for guix-devel@gnu.org; Sat, 13 Feb 2016 15:13:34 -0500 Content-Disposition: inline In-Reply-To: <20160213172001.GA3956@debian> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel@gnu.org 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!