diff options
| author | Alex Kost <alezost@gmail.com> | 2016-05-19 19:11:58 +0300 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-08-10 15:29:40 -0400 |
| commit | 8d65c71f125798cf27c479b3e72ea61c9ba0d7b2 (patch) | |
| tree | c33fb8993f974d63c29edfcf20536fef1bf7b21d | |
| parent | dd05e73102e19299ebc1d0daf8d95016075e048d (diff) | |
| download | guix-8d65c71f125798cf27c479b3e72ea61c9ba0d7b2.tar.gz | |
packages: Use '--no-backup-if-mismatch' for patching.
Suggested-by: Ludovic Courtès <ludo@gnu.org> * guix/packages.scm (patch-and-repack)[build]: Use '--no-backup-if-mismatch' patch flag to avoid making *.orig files.
| -rw-r--r-- | guix/packages.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 3646b9ba13..728b3afcae 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; ;;; 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" #+@flags "--input" patch))) + "--force" "--no-backup-if-mismatch" + #+@flags "--input" patch))) (define (first-file directory) ;; Return the name of the first file in DIRECTORY. |