[gentoo-commits] proj/portage:master commit in: bin/

[Michał Górny]

commit:     c9c8f00f8dbfd026b2140df944749aec6e5abba4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 10:06:23 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 19:32:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c9c8f00f

eapply: Update default patch arguments

 bin/phase-helpers.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 5be71fa..2fea0b2 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -990,7 +990,10 @@ if ___eapi_has_eapply; then
                        # -p1 as a sane default
                        # -f to avoid interactivity
                        # -s to silence progress output
-                       patch -p1 -f -s "${patch_options[@]}" < "${f}"
+                       # -g0 to guarantee no VCS interaction
+                       # --no-backup-if-mismatch not to pollute the sources
+                       patch -p1 -f -s -g0 --no-backup-if-mismatch \
+                               "${patch_options[@]}" < "${f}"
                        if ! eend ${?}; then
                                __helpers_die "patch -p1 ${patch_options[*]} 
failed with ${f}"
                                failed=1