From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SlZpG-00052U-5V for garchives@archives.gentoo.org; Mon, 02 Jul 2012 06:09:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D4DFE044C; Mon, 2 Jul 2012 06:09:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B4FC8E044C for ; Mon, 2 Jul 2012 06:09:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE4131B4102 for ; Mon, 2 Jul 2012 06:09:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AC8FCE5436 for ; Mon, 2 Jul 2012 06:09:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1341209350.3163a253ca6341f5f917f6da8242e63ee918a83e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Package.py pym/portage/dep/dep_check.py pym/portage/package/ebuild/config.py pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ pym/portage/dep/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3163a253ca6341f5f917f6da8242e63ee918a83e X-VCS-Branch: multilib Date: Mon, 2 Jul 2012 06:09:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: daf735b3-2b60-4341-85bc-4f28836c784e X-Archives-Hash: 2dcb9c9f05e5ad9acb8ad274d13503ae commit: 3163a253ca6341f5f917f6da8242e63ee918a83e Author: Zac Medico gentoo org> AuthorDate: Mon Jul 2 06:09:10 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 2 06:09:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3163a253 Use str.split() instead of split(' '). --- pym/_emerge/Package.py | 2 +- pym/portage/dep/dep_check.py | 2 +- pym/portage/package/ebuild/config.py | 2 +- pym/portage/package/ebuild/doebuild.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 3b4c666..df06a72 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -676,7 +676,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapper= Base): def _set_iuse(self, k, v): if 'force-multilib' in self._pkg.root_config.settings.features: if self._pkg.built is False: - for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_AB= IS", '').split(' '): + for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_AB= IS", '').split(): v =3D v + " multilib_abi_" + multilib_abis v =3D v + " abiwrapper" self._pkg.iuse =3D self._pkg._iuse( diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 0a7010d..14d735d 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -69,7 +69,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, myse= ttings, myroot=3D"/", =20 if 'force-multilib' in mysettings.features: 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_getke= y(x) not in mysettings.get("NO_AUTO_FLAG", None): if ']' in x: x =3D str(x).replace(']',',multilib_abi_' + multilib_abis + '?]') diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index e0b84f2..21313b5 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1595,7 +1595,7 @@ class config(object): iuse_implicit.add("test") =20 if 'force-multilib' in self.features: - 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) =20 return iuse_implicit diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 99de333..53bb24a 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1641,7 +1641,7 @@ def _post_src_install_write_metadata(settings): v =3D settings.get(k) if "force-multilib" in settings.features: v =3D v + " abiwrapper" - for i in settings.get('MULTILIB_ABIS').split(' '): + for i in settings.get('MULTILIB_ABIS').split(): v =3D v + " multilib_abi_" + i if v is not None: write_atomic(os.path.join(build_info_dir, k), v + '\n')