guix-commits
[Top][All Lists]
Advanced

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

01/10: packages: Use '--no-backup-if-mismatch' for patching.


From: Leo Famulari
Subject: 01/10: packages: Use '--no-backup-if-mismatch' for patching.
Date: Wed, 10 Aug 2016 19:41:41 +0000 (UTC)

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

commit 8d65c71f125798cf27c479b3e72ea61c9ba0d7b2
Author: Alex Kost <address@hidden>
Date:   Thu May 19 19:11:58 2016 +0300

    packages: Use '--no-backup-if-mismatch' for patching.
    
    Suggested-by: Ludovic Courtès <address@hidden>
    
    * guix/packages.scm (patch-and-repack)[build]: Use
      '--no-backup-if-mismatch' patch flag to avoid making *.orig files.
---
 guix/packages.scm |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 3646b9b..728b3af 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2016 Alex Kost <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -478,9 +479,11 @@ specifies modules in scope when evaluating SNIPPET."
               (format (current-error-port) "applying '~a'...~%" patch)
 
               ;; Use '--force' so that patches that do not apply perfectly are
-              ;; rejected.
+              ;; rejected.  Use '--no-backup-if-mismatch' to prevent making
+              ;; "*.orig" file if a patch is applied with offset.
               (zero? (system* (string-append #+patch "/bin/patch")
-                              "--force" address@hidden "--input" patch)))
+                              "--force" "--no-backup-if-mismatch"
+                              address@hidden "--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]