aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-10-16 12:06:23 +0200
committerMichał Górny <mgorny@gentoo.org>2015-11-12 20:32:37 +0100
commitc9c8f00f8dbfd026b2140df944749aec6e5abba4 (patch)
tree4f6984732a901cb5f24d5d4631298835f1476d74
parenteapply: Update parameter splitting to match the spec (diff)
downloadportage-c9c8f00f8dbfd026b2140df944749aec6e5abba4.tar.gz
portage-c9c8f00f8dbfd026b2140df944749aec6e5abba4.tar.bz2
portage-c9c8f00f8dbfd026b2140df944749aec6e5abba4.zip
eapply: Update default patch arguments
-rw-r--r--bin/phase-helpers.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 5be71faab..2fea0b297 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