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

[Leo Famulari]

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

commit 98e8dc61736f48a9a0be54281d63e03a77b601f3
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 d62d1f3..7178674 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.
 ;;;
@@ -464,9 +465,11 @@ IMPORTED-MODULES specify modules to use/import for use by 
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.