[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      12/10/29 09:49:54

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use find instead of hard-coded executable locations list when linking the wrapper.

Revision  Changes    Path
1.479                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.479&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.479&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.478&r2=1.479

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- ChangeLog	29 Oct 2012 09:47:41 -0000	1.478
+++ ChangeLog	29 Oct 2012 09:49:54 -0000	1.479
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.478 2012/10/29 09:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.479 2012/10/29 09:49:54 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use find instead of hard-coded executable locations list when linking the
+  wrapper.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Use new python-r1 functions.



1.10                 eclass/distutils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.9&r2=1.10

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- distutils-r1.eclass	29 Oct 2012 09:47:41 -0000	1.9
+++ distutils-r1.eclass	29 Oct 2012 09:49:54 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.9 2012/10/29 09:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.10 2012/10/29 09:49:54 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -256,15 +256,14 @@
 	local EPYTHON
 	python_export_best EPYTHON
 
-	for f in "${D}"/{bin,sbin,usr/bin,usr/sbin,games/bin}/*-"${EPYTHON}"; do
-		if [[ -x ${f} ]]; then
-			debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
+	local f
+	while IFS= read -r -d '' f; do
+		debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
 
-			local wrapf=${f%-${EPYTHON}}
+		local wrapf=${f%-${EPYTHON}}
 
-			_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
-		fi
-	done
+		_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
+	done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0)
 }
 
 # @FUNCTION: distutils-r1_run_phase