From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 1 Mar 2017 08:20:12 +0000 (+0100)
Subject: python-utils-r1.eclass: _python_set_impls, add integrity check
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d2fb3f82e9c4ea1626eb465b153ccd1e8c5b2c9e;p=gentoo.git

python-utils-r1.eclass: _python_set_impls, add integrity check

Add integrity check for multi-inherits, i.e. ensure that PYTHON_COMPAT
has not changed between successive calls to _python_set_impls. If it did
(e.g. because of eclass+ebuild setting different values), then we abort
not to give surprising results to the user.
---

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a6f197bd418f..c75c4678e310 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -128,9 +128,25 @@ _python_set_impls() {
 		die "No supported implementation in PYTHON_COMPAT."
 	fi
 
-	_PYTHON_SUPPORTED_IMPLS=( "${supp[@]}" )
-	_PYTHON_UNSUPPORTED_IMPLS=( "${unsupp[@]}" )
-	readonly _PYTHON_SUPPORTED_IMPLS _PYTHON_UNSUPPORTED_IMPLS
+	if [[ ${_PYTHON_SUPPORTED_IMPLS[@]} ]]; then
+		# set once already, verify integrity
+		if [[ ${_PYTHON_SUPPORTED_IMPLS[@]} != ${supp[@]} ]]; then
+			eerror "Supported impls (PYTHON_COMPAT) changed between inherits!"
+			eerror "Before: ${_PYTHON_SUPPORTED_IMPLS[*]}"
+			eerror "Now   : ${supp[*]}"
+			die "_PYTHON_SUPPORTED_IMPLS integrity check failed"
+		fi
+		if [[ ${_PYTHON_UNSUPPORTED_IMPLS[@]} != ${unsupp[@]} ]]; then
+			eerror "Unsupported impls changed between inherits!"
+			eerror "Before: ${_PYTHON_UNSUPPORTED_IMPLS[*]}"
+			eerror "Now   : ${unsupp[*]}"
+			die "_PYTHON_UNSUPPORTED_IMPLS integrity check failed"
+		fi
+	else
+		_PYTHON_SUPPORTED_IMPLS=( "${supp[@]}" )
+		_PYTHON_UNSUPPORTED_IMPLS=( "${unsupp[@]}" )
+		readonly _PYTHON_SUPPORTED_IMPLS _PYTHON_UNSUPPORTED_IMPLS
+	fi
 }
 
 # @ECLASS-VARIABLE: PYTHON