Gentoo Archives: gentoo-portage-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: Re: [gentoo-portage-dev] [PATCH] eapply: Drop -s option for patch.
Date: Thu, 12 Dec 2019 18:03:16
Message-Id: CAJ0EP43+_7kP1xajzd9t43fJhF0sCX=8fmgmNVR3H6yS_Jeq-Q@mail.gmail.com
In Reply to: Re: [gentoo-portage-dev] [PATCH] eapply: Drop -s option for patch. by Zac Medico
1 On Mon, Nov 25, 2019 at 11:53 AM Zac Medico <zmedico@g.o> wrote:
2 >
3 > On 11/25/19 5:03 AM, Ulrich Müller wrote:
4 > > We generally try to have verbose build logs, e.g., by calling
5 > > configure with --disable-silent-rules. Silencing patch contradicts
6 > > this, and will suppress reporting of fuzz factors.
7 > >
8 > > Note that the eapply specification in PMS calls patch without -s:
9 > > https://projects.gentoo.org/pms/7/pms.html#x1-127001r1
10 > > Traditionally, the -s option wasn't used by epatch either.
11 > >
12 > > Bug: https://bugs.gentoo.org/674562
13 > > Signed-off-by: Ulrich Müller <ulm@g.o>
14 > > ---
15 > > bin/phase-helpers.sh | 3 +--
16 > > 1 file changed, 1 insertion(+), 2 deletions(-)
17 > >
18 > > diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
19 > > index b53d39650..60f8d3243 100644
20 > > --- a/bin/phase-helpers.sh
21 > > +++ b/bin/phase-helpers.sh
22 > > @@ -993,10 +993,9 @@ if ___eapi_has_eapply; then
23 > > ebegin "${prefix:-Applying }${f##*/}"
24 > > # -p1 as a sane default
25 > > # -f to avoid interactivity
26 > > - # -s to silence progress output
27 > > # -g0 to guarantee no VCS interaction
28 > > # --no-backup-if-mismatch not to pollute the sources
29 > > - ${patch_cmd} -p1 -f -s -g0 --no-backup-if-mismatch \
30 > > + ${patch_cmd} -p1 -f -g0 --no-backup-if-mismatch \
31 > > "${patch_options[@]}" < "${f}"
32 > > failed=${?}
33 > > if ! eend "${failed}"; then
34 > >
35 >
36 > Looks good. Please merge.
37
38 I think this should be reverted. It causes too much noise, and
39 "solves" a problem only very rarely.

Replies