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

["Ali Polatel (hawking)" <hawking@gentoo.org>]

hawking     08/05/29 15:24:35

  Modified:             python.eclass
  Log:
  Make python_mod_optimize ROOT aware.

Revision  Changes    Path
1.36                 eclass/python.eclass

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

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- python.eclass	29 May 2008 14:10:48 -0000	1.35
+++ python.eclass	29 May 2008 15:24:35 -0000	1.36
@@ -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.35 2008/05/29 14:10:48 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.36 2008/05/29 15:24:35 hawking Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -168,12 +168,20 @@
 # in the supplied directory
 #
 # Example:
-#         python_mod_optimize ${ROOT}usr/share/codegen
+#         python_mod_optimize /usr/share/codegen
 python_mod_optimize() {
-	local myroot
+	local mydirs myfiles myroot path
 	# strip trailing slash
 	myroot="${ROOT%/}"
 
+	# respect ROOT
+	for path in $@; do
+		[ ! -e "${myroot}/${path}" ] && ewarn "${myroot}/${path} doesn't exist!"
+		[ -d "${myroot}/${path#/}" ] && mydirs="${mydirs} ${myroot}/${path#/}"
+		# Files are passed to python_mod_compile which is ROOT-aware
+		[ -f "${myroot}/${path}" ] && myfiles="${myfiles} ${path}"
+	done
+
 	# allow compiling for older python versions
 	if [ -n "${PYTHON_OVERRIDE_PYVER}" ]; then
 		PYVER=${PYTHON_OVERRIDE_PYVER}
@@ -189,8 +197,19 @@
 	fi
 
 	ebegin "Byte compiling python modules for python-${PYVER} .."
-	python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py ${compileopts} $@
-	python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py ${compileopts} $@
+	if [ -n "${mydirs}" ]; then
+		python${PYVER} \
+			${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py \
+			${compileopts} ${mydirs}
+		python${PYVER} -O \
+			${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py \
+			${compileopts} ${mydirs}
+	fi
+
+	if [ -n "${myfiles}" ]; then
+		python_mod_compile ${myfiles}
+	fi
+
 	eend $?
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list