Gentoo Archives: gentoo-portage-dev

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

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies