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

["Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@gentoo.org>]

arfrever    09/11/15 22:00:47

  Modified:             python.eclass
  Log:
  Fix support for non-multilib profiles in PYTHON(). Print additional data in validate_PYTHON_ABIS() when EPYTHON variable isn't respected.

Revision  Changes    Path
1.79                 eclass/python.eclass

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

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- python.eclass	15 Nov 2009 14:25:55 -0000	1.78
+++ python.eclass	15 Nov 2009 22:00:47 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.78 2009/11/15 14:25:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.79 2009/11/15 22:00:47 arfrever Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -107,7 +107,7 @@
 		echo -n "python${slot}"
 	fi
 
-	if [[ "${ABI}" != "${DEFAULT_ABI}" ]]; then
+	if [[ -n "${ABI}" && "${ABI}" != "${DEFAULT_ABI}" && "${DEFAULT_ABI}" != "default" ]]; then
 		echo -n "-${ABI}"
 	fi
 }
@@ -260,6 +260,12 @@
 
 			# Ensure that EPYTHON variable is respected.
 			if [[ "$(EPYTHON="$(PYTHON)" python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" != "${PYTHON_ABI}" ]]; then
+				eerror "python:                    '$(type -p python)'"
+				eerror "ABI:                       '${ABI}'"
+				eerror "DEFAULT_ABI:               '${DEFAULT_ABI}'"
+				eerror "EPYTHON:                   '$(PYTHON)'"
+				eerror "PYTHON_ABI:                '${PYTHON_ABI}'"
+				eerror "Version of enabled Python: '$(EPYTHON="$(PYTHON)" python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')'"
 				die "'python' doesn't respect EPYTHON variable"
 			fi
 		done
@@ -1016,10 +1022,10 @@
 }
 
 # @FUNCTION: python_mod_cleanup
-# @USAGE: [directory]
+# @USAGE: [directory|file]
 # @DESCRIPTION:
-# Run with optional arguments, where arguments are directories of
-# python modules. If none given, it will look in /usr/lib/python[0-9].[0-9].
+# Run with optional arguments, where arguments are Python modules. If none given,
+# it will look in /usr/lib/python[0-9].[0-9].
 #
 # It will recursively scan all compiled Python modules in the directories and
 # determine if they are orphaned (i.e. their corresponding .py files are missing.)