* [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/
@ 2011-11-15 19:57 Thomas Sachau
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Sachau @ 2011-11-15 19:57 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/
@ 2012-07-02 5:56 Zac Medico
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico @ 2012-07-02 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 2480f162cbe624b25a032b83d1bc77791b47598b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 05:56:06 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 05:56:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2480f162
Fix style of config.features access.
---
pym/_emerge/EbuildExecuter.py | 2 +-
pym/_emerge/Package.py | 2 +-
pym/_emerge/actions.py | 2 +-
pym/_emerge/main.py | 2 +-
pym/portage/dep/dep_check.py | 2 +-
pym/portage/package/ebuild/config.py | 17 ++++++++++-------
pym/portage/package/ebuild/doebuild.py | 2 +-
7 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index 14ef437..5898e5e 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -93,7 +93,7 @@ class EbuildExecuter(CompositeTask):
phase=phase, scheduler=self.scheduler,
settings=self.settings))
- if 'force-multilib' in self.settings["FEATURES"]:
+ if 'force-multilib' in self.settings.features:
self._start_task(ebuild_phases, self._install_exit)
else:
self._start_task(ebuild_phases, self._default_final_exit)
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 5cb5e83..3b4c666 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -674,7 +674,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
self._pkg.inherited = v
def _set_iuse(self, k, v):
- if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", ''):
+ 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_ABIS", '').split(' '):
v = v + " multilib_abi_" + multilib_abis
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index ebee40e..e469f0a 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1504,7 +1504,7 @@ def action_info(settings, trees, myopts, myfiles):
myvars = portage.util.unique_array(myvars)
use_expand = settings.get('USE_EXPAND', '').split()
- if 'force-multilib' in settings.get("FEATURES", ""):
+ if 'force-multilib' in settings.features:
use_expand.append("MULTILIB_ABIS")
use_expand.sort()
unset_vars = []
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 460c422..da8eb45 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1681,7 +1681,7 @@ def emerge_main(args=None):
adjust_configs(myopts, trees)
apply_priorities(settings)
- if 'force-multilib' in settings.get("FEATURES", ""):
+ if 'force-multilib' in settings.features:
if settings.get("NO_AUTO_FLAG", "") is "":
writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index e378fcb..0a7010d 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -67,7 +67,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
if repoman:
x = x._eval_qa_conditionals(use_mask, use_force)
- if 'force-multilib' in mysettings.get("FEATURES", ''):
+ if 'force-multilib' in mysettings.features:
if not repoman :
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):
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index cf4e981..e0b84f2 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -426,6 +426,7 @@ class config(object):
known_repos = []
portdir = ""
portdir_overlay = ""
+ features = []
for confs in [make_globals, make_conf, self.configdict["env"]]:
v = confs.get("PORTDIR")
if v is not None:
@@ -435,6 +436,9 @@ class config(object):
if v is not None:
portdir_overlay = v
known_repos.extend(shlex_split(v))
+ v = confs.get("FEATURES")
+ if v is not None:
+ features.append(v.split())
known_repos = frozenset(known_repos)
self["PORTDIR"] = portdir
self["PORTDIR_OVERLAY"] = portdir_overlay
@@ -474,7 +478,8 @@ class config(object):
self.configlist.append(mygcfg)
self.configdict["defaults"]=self.configlist[-1]
- if 'force-multilib' in confs.get("FEATURES", ""):
+ features = stack_lists(features)
+ if 'force-multilib' in features:
if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None:
self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
@@ -791,9 +796,9 @@ class config(object):
self[var] = default_val
self.backup_changes(var)
- if 'force-multilib' in self.get("FEATURES", ""):
+ if 'force-multilib' in features:
#add multilib_abi internally to list of USE_EXPANDed vars
- self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "")
+ self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
self.backup_changes("USE_EXPAND")
# initialize self.features
@@ -1349,7 +1354,7 @@ class config(object):
if pkg_defaults:
defaults.extend(pkg_defaults)
defaults = " ".join(defaults)
- if 'force-multilib' in self.get("FEATURES", ""):
+ if 'force-multilib' in self.features:
if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None:
defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
if defaults != self.configdict["defaults"].get("USE",""):
@@ -1589,7 +1594,7 @@ class config(object):
# FEATURES=test for all ebuilds, regardless of explicit IUSE.
iuse_implicit.add("test")
- if 'force-multilib' in self.get("FEATURES", ""):
+ if 'force-multilib' in self.features:
for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
iuse_implicit.add("multilib_abi_" + multilib_abis)
@@ -2003,8 +2008,6 @@ class config(object):
# Do the USE calculation last because it depends on USE_EXPAND.
use_expand = self.get("USE_EXPAND", "").split()
- if 'force-multilib' in self.get("FEATURES", ""):
- use_expand.append("MULTILIB_ABI")
use_expand_dict = self._use_expand_dict
use_expand_dict.clear()
for k in use_expand:
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index c481818..99de333 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1639,7 +1639,7 @@ def _post_src_install_write_metadata(settings):
for k in ('IUSE',):
v = settings.get(k)
- if "force-multilib" in settings.get('FEATURES'):
+ if "force-multilib" in settings.features:
v = v + " abiwrapper"
for i in settings.get('MULTILIB_ABIS').split(' '):
v = v + " multilib_abi_" + i
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/
@ 2012-07-02 6:09 Zac Medico
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico @ 2012-07-02 6:09 UTC (permalink / raw
To: gentoo-commits
commit: 3163a253ca6341f5f917f6da8242e63ee918a83e
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 06:09:10 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 06:09:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3163a253
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(_PackageMetadataWrapperBase):
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_ABIS", '').split(' '):
+ for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split():
v = v + " multilib_abi_" + multilib_abis
v = v + " abiwrapper"
self._pkg.iuse = 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, mysettings, myroot="/",
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_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 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")
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)
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 = settings.get(k)
if "force-multilib" in settings.features:
v = v + " abiwrapper"
- for i in settings.get('MULTILIB_ABIS').split(' '):
+ for i in settings.get('MULTILIB_ABIS').split():
v = v + " multilib_abi_" + i
if v is not None:
write_atomic(os.path.join(build_info_dir, k), v + '\n')
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-02 6:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-15 19:57 [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/, pym/portage/dep/, pym/_emerge/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2012-07-02 5:56 Zac Medico
2012-07-02 6:09 Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox