1 |
floppym 12/01/30 20:18:38 |
2 |
|
3 |
Modified: ChangeLog python.eclass |
4 |
Log: |
5 |
Detect needless usage of python_convert_shebangs(). Patch by Arfrever. |
6 |
|
7 |
Revision Changes Path |
8 |
1.105 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.105&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.105&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.104&r2=1.105 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.104 |
18 |
retrieving revision 1.105 |
19 |
diff -u -r1.104 -r1.105 |
20 |
--- ChangeLog 30 Jan 2012 13:11:27 -0000 1.104 |
21 |
+++ ChangeLog 30 Jan 2012 20:18:38 -0000 1.105 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.104 2012/01/30 13:11:27 jlec Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.105 2012/01/30 20:18:38 floppym Exp $ |
27 |
+ |
28 |
+ 30 Jan 2012; Mike Gilbert <floppym@g.o> python.eclass: |
29 |
+ Detect needless usage of python_convert_shebangs(). Patch by Arfrever. |
30 |
|
31 |
30 Jan 2012; Justin Lecher <jlec@g.o> autotools-utils.eclass: |
32 |
Call glib-gettextize with --force in autotools-utils.eclass |
33 |
|
34 |
|
35 |
|
36 |
1.146 eclass/python.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.146&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.146&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.145&r2=1.146 |
41 |
|
42 |
Index: python.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
45 |
retrieving revision 1.145 |
46 |
retrieving revision 1.146 |
47 |
diff -u -r1.145 -r1.146 |
48 |
--- python.eclass 21 Jan 2012 19:48:20 -0000 1.145 |
49 |
+++ python.eclass 30 Jan 2012 20:18:38 -0000 1.146 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.145 2012/01/21 19:48:20 floppym Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.146 2012/01/30 20:18:38 floppym Exp $ |
55 |
|
56 |
# @ECLASS: python.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -11,7 +11,7 @@ |
59 |
|
60 |
# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning. |
61 |
if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then |
62 |
- inherit multilib |
63 |
+ inherit eutils multilib |
64 |
fi |
65 |
|
66 |
# Export pkg_setup every time to avoid issues with eclass inheritance order. |
67 |
@@ -484,7 +484,7 @@ |
68 |
python_convert_shebangs() { |
69 |
_python_check_python_pkg_setup_execution |
70 |
|
71 |
- local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" |
72 |
+ local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0" |
73 |
|
74 |
while (($#)); do |
75 |
case "$1" in |
76 |
@@ -549,6 +549,8 @@ |
77 |
if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then |
78 |
[[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue |
79 |
|
80 |
+ shebangs_converted="1" |
81 |
+ |
82 |
if [[ "${quiet}" == "0" ]]; then |
83 |
einfo "Converting shebang in '${file}'" |
84 |
fi |
85 |
@@ -556,6 +558,10 @@ |
86 |
sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" |
87 |
fi |
88 |
done |
89 |
+ |
90 |
+ if [[ "${shebangs_converted}" == "0" ]]; then |
91 |
+ eqawarn "${FUNCNAME}(): Python scripts not found" |
92 |
+ fi |
93 |
} |
94 |
|
95 |
# @FUNCTION: python_clean_py-compile_files |