Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 2/2] python-utils-r1.eclass: Fix all correct check in python_fix_shebang
Date: Fri, 14 Sep 2018 22:45:17
Message-Id: 20180914224438.29404-2-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] python-utils-r1.eclass: Simplify sed call in python_fix_shebang by James Le Cuirot
1 When matching EPYTHON, it would previously call sed and set
2 any_fixed=1 even though it was already correct. If all are correct, it
3 is supposed to raise a QA warning/error.
4 ---
5 eclass/python-utils-r1.eclass | 3 +--
6 1 file changed, 1 insertion(+), 2 deletions(-)
7
8 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
9 index 121f2382ba78..f93235e3f5f4 100644
10 --- a/eclass/python-utils-r1.eclass
11 +++ b/eclass/python-utils-r1.eclass
12 @@ -1187,8 +1187,7 @@ python_fix_shebang() {
13
14 # Nothing to do, move along.
15 any_correct=1
16 - from=${EPYTHON}
17 - break
18 + continue 2
19 ;;
20 *python|*python[23])
21 debug-print "${FUNCNAME}: in file ${f#${D%/}}"
22 --
23 2.18.0