public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download: 
* [gentoo-portage-dev] [PATCH 3/3] eapply: Update default patch arguments
  @ 2015-10-16 10:12 99% ` Michał Górny
  0 siblings, 0 replies; 1+ results
From: Michał Górny @ 2015-10-16 10:12 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Michał Górny

---
 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
-- 
2.6.1



^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-10-16 10:12     [gentoo-portage-dev] [PATCHES] EAPI 6 updates Michał Górny
2015-10-16 10:12 99% ` [gentoo-portage-dev] [PATCH 3/3] eapply: Update default patch arguments Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox