Gentoo Archives: gentoo-portage-dev

From: Ulrich Mueller <ulm@g.o>
To: Mike Gilbert <floppym@g.o>
Cc: gentoo-portage-dev@l.g.o, Michael Orlitzky <mjo@g.o>
Subject: Re: [gentoo-portage-dev] [PATCH v2] eapply: Output verbosely only if patch fails to apply with -F0
Date: Fri, 13 Dec 2019 22:49:52
Message-Id: w6geex7vo1n.fsf@kph.uni-mainz.de
In Reply to: Re: [gentoo-portage-dev] [PATCH v2] eapply: Output verbosely only if patch fails to apply with -F0 by Mike Gilbert
1 >>>>> On Fri, 13 Dec 2019, Mike Gilbert wrote:
2
3 >> > It also triggers pointless bug reports. Please remove this.
4 >>
5 >> I don't like that eqawarn either (see above).
6 >>
7 >> OTOH, users shouldn't normally have "qa" in PORTAGE_ELOG_CLASSES,
8 >> so they won't see the warning?
9
10 > Here's a bug report filed by a user, which is what prompted me to
11 > reply on this thread in the first place.
12
13 > https://bugs.gentoo.org/702608
14
15 Well then, trivial patch included below.
16
17
18 From 81000b32d330a1cc41a4541f7e4264918eb7e6c5 Mon Sep 17 00:00:00 2001
19 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
20 Date: Fri, 13 Dec 2019 23:41:23 +0100
21 Subject: [PATCH] eapply: Drop QA warning for fuzz factor.
22 MIME-Version: 1.0
23 Content-Type: text/plain; charset=UTF-8
24 Content-Transfer-Encoding: 8bit
25
26 This didn't add any information beyond what is already present in the
27 output of patch. Developers will know how to interpret its output, and
28 users won't see the warning anyway with the standard configuration.
29
30 Signed-off-by: Ulrich Müller <ulm@g.o>
31 ---
32 bin/phase-helpers.sh | 2 --
33 1 file changed, 2 deletions(-)
34
35 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
36 index b5691bd70..020862ba0 100644
37 --- a/bin/phase-helpers.sh
38 +++ b/bin/phase-helpers.sh
39 @@ -1004,8 +1004,6 @@ if ___eapi_has_eapply; then
40 if ${patch_cmd} "${all_opts[@]}" --dry-run -s -F0 \
41 < "${f}" &>/dev/null; then
42 all_opts+=( -s -F0 )
43 - else
44 - eqawarn " ${f}: patch failed to apply without a fuzz factor, please rebase"
45 fi
46
47 ${patch_cmd} "${all_opts[@]}" < "${f}"
48 --
49 2.24.0

Attachments

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

Replies