[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: packages: Apply patches with "patch --force".

From: Ludovic Courtès
Subject: 01/03: packages: Apply patches with "patch --force".
Date: Fri, 26 Dec 2014 23:20:54 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit 94264407815da63c5f07a519cd41838e35ab464e
Author: Ludovic Courtès <address@hidden>
Date:   Fri Dec 26 23:29:51 2014 +0100

    packages: Apply patches with "patch --force".
    Fixes <>.
    Reported by Mark H Weaver <address@hidden>.
    * guix/packages.scm (patch-and-repack): Change "--batch" to "--force".
 guix/packages.scm |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 07f6d0c..cf16a47 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -398,7 +398,10 @@ IMPORTED-MODULES specify modules to use/import for use by 
          (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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]