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

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

hawking     08/01/23 22:19:05

  Modified:             distutils.eclass
  Log:
  Fixed ROOT usage for distutils_pkg_postinst failing when ROOT ends with slash

Revision  Changes    Path
1.45                 eclass/distutils.eclass

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

Index: distutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- distutils.eclass	25 Oct 2007 13:49:10 -0000	1.44
+++ distutils.eclass	23 Jan 2008 22:19:04 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.44 2007/10/25 13:49:10 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.45 2008/01/23 22:19:04 hawking Exp $
 #
 # Author: Jon Nelson <jnelson@gentoo.org>
 # Current Maintainer: Alastair Tse <liquidx@gentoo.org>
@@ -99,11 +99,14 @@
 distutils_pkg_postinst() {
 	PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}}
 
+	# strip trailing slash
+	myroot="${ROOT%/}"
+
 	if has_version ">=dev-lang/python-2.3"; then
 		python_version
 		for pymod in ${PYTHON_MODNAME}; do
-			if [ -d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then
-				python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}
+			if [ -d "${myroot}/usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then
+				python_mod_optimize ${myroot}/usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}
 			fi
 		done
 	fi



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