[gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     52721ca88ba34565efae2b2b4f936e05fa8cabb9
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 19:43:20 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 19:57:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=52721ca8

Don't throw a ridiciulous/unhelpful python exception when MULTILIB_ABIS is not set.

---
 pym/_emerge/Package.py               |    2 +-
 pym/portage/dep/dep_check.py         |    2 +-
 pym/portage/package/ebuild/config.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index c43e497..27af1e6 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -639,7 +639,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
 
 	def _set_iuse(self, k, v):
 		if self._pkg.root_config.settings['MULTILIB_ABIS'].count(' ') != 0:
-			for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", []).split(' '):
+			for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '):
 				v = v + " multilib_abi_" + multilib_abis
 		self._pkg.iuse = self._pkg._iuse(
 			v.split(), self._pkg.root_config.settings._iuse_implicit_match)

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index c3ba667..3dc421b 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -70,7 +70,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 			x = x._eval_qa_conditionals(use_mask, use_force)
 
 		if not repoman :
-			for multilib_abis in mysettings.get("MULTILIB_ABIS", []).split(' '):
+			for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '):
 				if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None):
 					if ']' in x:
 						x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]')

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index ee6253f..e10174f 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1468,7 +1468,7 @@ class config(object):
 		iuse_implicit.add("test")
 
 		if self['MULTILIB_ABIS'].count(' ') != 0:
-			for multilib_abis in self.get('MULTILIB_ABIS', []).split(' '):
+			for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
 				iuse_implicit.add("multilib_abi_" + multilib_abis)
 
 		return iuse_implicit