| 1 |
--- |
| 2 |
bin/phase-helpers.sh | 5 ++++- |
| 3 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 4 |
|
| 5 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 6 |
index 5be71fa..2fea0b2 100644 |
| 7 |
--- a/bin/phase-helpers.sh |
| 8 |
+++ b/bin/phase-helpers.sh |
| 9 |
@@ -990,7 +990,10 @@ if ___eapi_has_eapply; then |
| 10 |
# -p1 as a sane default |
| 11 |
# -f to avoid interactivity |
| 12 |
# -s to silence progress output |
| 13 |
- patch -p1 -f -s "${patch_options[@]}" < "${f}" |
| 14 |
+ # -g0 to guarantee no VCS interaction |
| 15 |
+ # --no-backup-if-mismatch not to pollute the sources |
| 16 |
+ patch -p1 -f -s -g0 --no-backup-if-mismatch \ |
| 17 |
+ "${patch_options[@]}" < "${f}" |
| 18 |
if ! eend ${?}; then |
| 19 |
__helpers_die "patch -p1 ${patch_options[*]} failed with ${f}" |
| 20 |
failed=1 |
| 21 |
-- |
| 22 |
2.6.1 |
Archives