| 1 |
commit: 3163a253ca6341f5f917f6da8242e63ee918a83e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 06:09:10 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 06:09:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3163a253 |
| 7 |
|
| 8 |
Use str.split() instead of split(' '). |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/Package.py | 2 +- |
| 12 |
pym/portage/dep/dep_check.py | 2 +- |
| 13 |
pym/portage/package/ebuild/config.py | 2 +- |
| 14 |
pym/portage/package/ebuild/doebuild.py | 2 +- |
| 15 |
4 files changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py |
| 18 |
index 3b4c666..df06a72 100644 |
| 19 |
--- a/pym/_emerge/Package.py |
| 20 |
+++ b/pym/_emerge/Package.py |
| 21 |
@@ -676,7 +676,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): |
| 22 |
def _set_iuse(self, k, v): |
| 23 |
if 'force-multilib' in self._pkg.root_config.settings.features: |
| 24 |
if self._pkg.built is False: |
| 25 |
- for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '): |
| 26 |
+ for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(): |
| 27 |
v = v + " multilib_abi_" + multilib_abis |
| 28 |
v = v + " abiwrapper" |
| 29 |
self._pkg.iuse = self._pkg._iuse( |
| 30 |
|
| 31 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 32 |
index 0a7010d..14d735d 100644 |
| 33 |
--- a/pym/portage/dep/dep_check.py |
| 34 |
+++ b/pym/portage/dep/dep_check.py |
| 35 |
@@ -69,7 +69,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 36 |
|
| 37 |
if 'force-multilib' in mysettings.features: |
| 38 |
if not repoman : |
| 39 |
- for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '): |
| 40 |
+ for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(): |
| 41 |
if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None): |
| 42 |
if ']' in x: |
| 43 |
x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]') |
| 44 |
|
| 45 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 46 |
index e0b84f2..21313b5 100644 |
| 47 |
--- a/pym/portage/package/ebuild/config.py |
| 48 |
+++ b/pym/portage/package/ebuild/config.py |
| 49 |
@@ -1595,7 +1595,7 @@ class config(object): |
| 50 |
iuse_implicit.add("test") |
| 51 |
|
| 52 |
if 'force-multilib' in self.features: |
| 53 |
- for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '): |
| 54 |
+ for multilib_abis in self.get('MULTILIB_ABIS', '').split(): |
| 55 |
iuse_implicit.add("multilib_abi_" + multilib_abis) |
| 56 |
|
| 57 |
return iuse_implicit |
| 58 |
|
| 59 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 60 |
index 99de333..53bb24a 100644 |
| 61 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 62 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 63 |
@@ -1641,7 +1641,7 @@ def _post_src_install_write_metadata(settings): |
| 64 |
v = settings.get(k) |
| 65 |
if "force-multilib" in settings.features: |
| 66 |
v = v + " abiwrapper" |
| 67 |
- for i in settings.get('MULTILIB_ABIS').split(' '): |
| 68 |
+ for i in settings.get('MULTILIB_ABIS').split(): |
| 69 |
v = v + " multilib_abi_" + i |
| 70 |
if v is not None: |
| 71 |
write_atomic(os.path.join(build_info_dir, k), v + '\n') |
Archives