diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2019-11-25 14:03:13 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2019-11-25 14:03:13 +0100 |
| commit | 12d0c48addaf4506dfd7b33f85f2441618a46dd2 (patch) | |
| tree | 9fae7e5917d46db694317d58ff03389e8c13d32b | |
| parent | Scheduler._run_pkg_pretend: don't use local event loop (diff) | |
| download | portage-12d0c48addaf4506dfd7b33f85f2441618a46dd2.tar.gz portage-12d0c48addaf4506dfd7b33f85f2441618a46dd2.tar.bz2 portage-12d0c48addaf4506dfd7b33f85f2441618a46dd2.zip | |
eapply: Drop -s option for patch.
We generally try to have verbose build logs, e.g., by calling
configure with --disable-silent-rules. Silencing patch contradicts
this, and will suppress reporting of fuzz factors.
Note that the eapply specification in PMS calls patch without -s:
https://projects.gentoo.org/pms/7/pms.html#x1-127001r1
Traditionally, the -s option wasn't used by epatch either.
Bug: https://bugs.gentoo.org/674562
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | bin/phase-helpers.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index b53d39650..60f8d3243 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -993,10 +993,9 @@ if ___eapi_has_eapply; then ebegin "${prefix:-Applying }${f##*/}" # -p1 as a sane default # -f to avoid interactivity - # -s to silence progress output # -g0 to guarantee no VCS interaction # --no-backup-if-mismatch not to pollute the sources - ${patch_cmd} -p1 -f -s -g0 --no-backup-if-mismatch \ + ${patch_cmd} -p1 -f -g0 --no-backup-if-mismatch \ "${patch_options[@]}" < "${f}" failed=${?} if ! eend "${failed}"; then |