From 94264407815da63c5f07a519cd41838e35ab464e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 26 Dec 2014 23:29:51 +0100 Subject: packages: Apply patches with "patch --force". Fixes . Reported by Mark H Weaver . * guix/packages.scm (patch-and-repack): Change "--batch" to "--force". --- guix/packages.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 07f6d0ccbc..cf16a4730c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -398,7 +398,10 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." (define (apply-patch input) (let ((patch* (assoc-ref %build-inputs input))) (format (current-error-port) "applying '~a'...~%" patch*) - (zero? (system* patch "--batch" ,@flags "--input" patch*)))) + + ;; Use '--force' so that patches that do not apply perfectly are + ;; rejected. + (zero? (system* patch "--force" ,@flags "--input" patch*)))) (define (first-file directory) ;; Return the name of the first file in DIRECTORY. -- cgit 1.4.1