[gentoo-commits] gentoo-x86 commit in eclass: python.eclass

[Zac Medico (zmedico)]

zmedico     08/10/30 05:21:46

  Modified:             python.eclass
  Log:
  Bug #244946 - Use different syntax to pipe find output into while loops inside
  python_mod_cleanup(), as a workaround for a bug in <bash-3.2 which causes
  incorrect saving of the environment when < <(find ...) syntax is used. The bug
  causes bash to die when attempting to source the resulting environment file.
  A similar issue has affected eutils.eclass in the past, triggering bug #215340.
  
  Also fix inverted argument validation logic inside python_mod_exists(), broken
  since version 1.47. Thanks to zlin for reporting.

Revision  Changes    Path
1.54                 eclass/python.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.53&r2=1.54

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- python.eclass	27 Oct 2008 12:23:50 -0000	1.53
+++ python.eclass	30 Oct 2008 05:21:46 -0000	1.54
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.53 2008/10/27 12:23:50 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.54 2008/10/30 05:21:46 zmedico Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -142,7 +142,7 @@
 #             echo "gtk support enabled"
 #         fi
 python_mod_exists() {
-	[[ "$1" ]] && die "${FUNCNAME} requires an argument!"
+	[[ "$1" ]] || die "${FUNCNAME} requires an argument!"
 	python -c "import $1" >/dev/null 2>&1
 }
 
@@ -296,16 +296,16 @@
 
 	for path in "${SEARCH_PATH[@]}"; do
 		einfo "Cleaning orphaned Python bytecode from ${path} .."
-		while read -rd ''; do
+		find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do
 			src_py="${REPLY%[co]}"
 			[[ -f "${src_py}" ]] && continue
 			einfo "Purging ${src_py}[co]"
 			rm -f "${src_py}"[co]
-		done < <(find "${path}" -name '*.py[co]' -print0)
+		done
 
 		# attempt to remove directories that maybe empty
-		while read -r dir; do
+		find "${path}" -type d | sort -r | while read -r dir; do
 			rmdir "${dir}" 2>/dev/null
-		done < <(find "${path}" -type d | sort -r)
+		done
 	done
 }