[Top][All Lists]

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

01/01: gnu: Use patch --force instead of --batch.

From: Mark H. Weaver
Subject: 01/01: gnu: Use patch --force instead of --batch.
Date: Sat, 27 Dec 2014 13:53:16 +0000

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

commit 9a224ac2e37482cb69c2803648bf3c66fbc6eee9
Author: Mark H Weaver <address@hidden>
Date:   Sat Dec 27 08:34:43 2014 -0500

    gnu: Use patch --force instead of --batch.
    * gnu/packages/linux.scm (linux-libre, net-tools): Pass "--force" to patch,
      instead of "--batch".
    * gnu/packages/mit-krb5.scm (mit-krb5): Ditto.
 gnu/packages/linux.scm    |    4 ++--
 gnu/packages/mit-krb5.scm |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a2708a2..9dc5f5c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -196,7 +196,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
           '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
              ;; Apply the neat patch.
-             (system* "patch" "-p1" "--batch"
+             (system* "patch" "-p1" "--force"
                       "-i" (assoc-ref inputs "patch/freedo+gnu"))
              (let ((arch (car (string-split system #\-))))
@@ -774,7 +774,7 @@ manpages.")
                  'unpack 'patch
                  (lambda* (#:key inputs #:allow-other-keys)
                    (define (apply-patch file)
-                     (zero? (system* "patch" "-p1" "--batch"
+                     (zero? (system* "patch" "-p1" "--force"
                                      "--input" file)))
                    (let ((patch.gz (assoc-ref inputs "patch")))
diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm
index 2528f46..3f3e857 100644
--- a/gnu/packages/mit-krb5.scm
+++ b/gnu/packages/mit-krb5.scm
@@ -62,7 +62,7 @@
                  ;; XXX The current patch system does not support unusual
                  ;; source unpack methods, so we have to apply this patch in a
                  ;; non-standard way.
-                 (zero? (system* "patch" "-p1" "--batch" "-i"
+                 (zero? (system* "patch" "-p1" "--force" "-i"
                                  (assoc-ref %build-inputs 

reply via email to

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