Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: Gentoo Dev <gentoo-dev@l.g.o>
Subject: Re: [gentoo-dev] [PATCH 06/12] python-utils-r1.eclass: Don't die in python_fix_shebang if all fixed
Date: Fri, 04 Jan 2019 18:11:00
Message-Id: CAJ0EP40qXmJH7a49jNSLZs2hwT0aeqrudm+0LXLNLw1FCPVG2g@mail.gmail.com
In Reply to: Re: [gentoo-dev] [PATCH 06/12] python-utils-r1.eclass: Don't die in python_fix_shebang if all fixed by "Michał Górny"
1 On Fri, Jan 4, 2019 at 10:55 AM Michał Górny <mgorny@g.o> wrote:
2 >
3 > On Thu, 2019-01-03 at 21:39 +0000, James Le Cuirot wrote:
4 > > Shebangs may need fixing on prefix systems or when cross-building but
5 > > not at other times.
6 > >
7 > > Signed-off-by: James Le Cuirot <chewi@g.o>
8 > > ---
9 > > eclass/python-utils-r1.eclass | 8 ++------
10 > > 1 file changed, 2 insertions(+), 6 deletions(-)
11 > >
12 > > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
13 > > index 19cfaf2798ab..91e457f3cf14 100644
14 > > --- a/eclass/python-utils-r1.eclass
15 > > +++ b/eclass/python-utils-r1.eclass
16 > > @@ -1328,16 +1328,12 @@ python_fix_shebang() {
17 > > fi
18 > > done < <(find -H "${path}" -type f -print0 || die)
19 > >
20 > > - if [[ ! ${any_fixed} ]]; then
21 > > + if [[ ! ${any_fixed} && ! ${any_correct} ]]; then
22 > > local cmd=eerror
23 > > [[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
24 > >
25 > > "${cmd}" "QA warning: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files."
26 > > - if [[ ${any_correct} ]]; then
27 > > - "${cmd}" "All files have ${EPYTHON} shebang already."
28 > > - else
29 > > - "${cmd}" "There are no Python files in specified directory."
30 > > - fi
31 > > + "${cmd}" "There are no Python files in specified directory."
32 > >
33 > > [[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
34 > > fi
35 >
36 > Sounds like you're introducing breakage, then abusing a function to fix
37 > your breakage, then killing a useful diagnostic because you've just
38 > broken it.
39
40 I'm unable to make sense of what you are trying to say here. Is there
41 something wrong with this patch, or are you making a general comment
42 on the patch series?
43
44 Also, please try to be less combative in your review process.

Replies