| 1 |
On 11/25/19 5:03 AM, Ulrich Müller wrote: |
| 2 |
> We generally try to have verbose build logs, e.g., by calling |
| 3 |
> configure with --disable-silent-rules. Silencing patch contradicts |
| 4 |
> this, and will suppress reporting of fuzz factors. |
| 5 |
> |
| 6 |
> Note that the eapply specification in PMS calls patch without -s: |
| 7 |
> https://projects.gentoo.org/pms/7/pms.html#x1-127001r1 |
| 8 |
> Traditionally, the -s option wasn't used by epatch either. |
| 9 |
> |
| 10 |
> Bug: https://bugs.gentoo.org/674562 |
| 11 |
> Signed-off-by: Ulrich Müller <ulm@g.o> |
| 12 |
> --- |
| 13 |
> bin/phase-helpers.sh | 3 +-- |
| 14 |
> 1 file changed, 1 insertion(+), 2 deletions(-) |
| 15 |
> |
| 16 |
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 17 |
> index b53d39650..60f8d3243 100644 |
| 18 |
> --- a/bin/phase-helpers.sh |
| 19 |
> +++ b/bin/phase-helpers.sh |
| 20 |
> @@ -993,10 +993,9 @@ if ___eapi_has_eapply; then |
| 21 |
> ebegin "${prefix:-Applying }${f##*/}" |
| 22 |
> # -p1 as a sane default |
| 23 |
> # -f to avoid interactivity |
| 24 |
> - # -s to silence progress output |
| 25 |
> # -g0 to guarantee no VCS interaction |
| 26 |
> # --no-backup-if-mismatch not to pollute the sources |
| 27 |
> - ${patch_cmd} -p1 -f -s -g0 --no-backup-if-mismatch \ |
| 28 |
> + ${patch_cmd} -p1 -f -g0 --no-backup-if-mismatch \ |
| 29 |
> "${patch_options[@]}" < "${f}" |
| 30 |
> failed=${?} |
| 31 |
> if ! eend "${failed}"; then |
| 32 |
> |
| 33 |
|
| 34 |
Looks good. Please merge. |
| 35 |
-- |
| 36 |
Thanks, |
| 37 |
Zac |
Archives