| 1 |
commit: 2480f162cbe624b25a032b83d1bc77791b47598b |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 2 05:56:06 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 2 05:56:06 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2480f162 |
| 7 |
|
| 8 |
Fix style of config.features access. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/EbuildExecuter.py | 2 +- |
| 12 |
pym/_emerge/Package.py | 2 +- |
| 13 |
pym/_emerge/actions.py | 2 +- |
| 14 |
pym/_emerge/main.py | 2 +- |
| 15 |
pym/portage/dep/dep_check.py | 2 +- |
| 16 |
pym/portage/package/ebuild/config.py | 17 ++++++++++------- |
| 17 |
pym/portage/package/ebuild/doebuild.py | 2 +- |
| 18 |
7 files changed, 16 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py |
| 21 |
index 14ef437..5898e5e 100644 |
| 22 |
--- a/pym/_emerge/EbuildExecuter.py |
| 23 |
+++ b/pym/_emerge/EbuildExecuter.py |
| 24 |
@@ -93,7 +93,7 @@ class EbuildExecuter(CompositeTask): |
| 25 |
phase=phase, scheduler=self.scheduler, |
| 26 |
settings=self.settings)) |
| 27 |
|
| 28 |
- if 'force-multilib' in self.settings["FEATURES"]: |
| 29 |
+ if 'force-multilib' in self.settings.features: |
| 30 |
self._start_task(ebuild_phases, self._install_exit) |
| 31 |
else: |
| 32 |
self._start_task(ebuild_phases, self._default_final_exit) |
| 33 |
|
| 34 |
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py |
| 35 |
index 5cb5e83..3b4c666 100644 |
| 36 |
--- a/pym/_emerge/Package.py |
| 37 |
+++ b/pym/_emerge/Package.py |
| 38 |
@@ -674,7 +674,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): |
| 39 |
self._pkg.inherited = v |
| 40 |
|
| 41 |
def _set_iuse(self, k, v): |
| 42 |
- if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", ''): |
| 43 |
+ if 'force-multilib' in self._pkg.root_config.settings.features: |
| 44 |
if self._pkg.built is False: |
| 45 |
for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '): |
| 46 |
v = v + " multilib_abi_" + multilib_abis |
| 47 |
|
| 48 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 49 |
index ebee40e..e469f0a 100644 |
| 50 |
--- a/pym/_emerge/actions.py |
| 51 |
+++ b/pym/_emerge/actions.py |
| 52 |
@@ -1504,7 +1504,7 @@ def action_info(settings, trees, myopts, myfiles): |
| 53 |
|
| 54 |
myvars = portage.util.unique_array(myvars) |
| 55 |
use_expand = settings.get('USE_EXPAND', '').split() |
| 56 |
- if 'force-multilib' in settings.get("FEATURES", ""): |
| 57 |
+ if 'force-multilib' in settings.features: |
| 58 |
use_expand.append("MULTILIB_ABIS") |
| 59 |
use_expand.sort() |
| 60 |
unset_vars = [] |
| 61 |
|
| 62 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 63 |
index 460c422..da8eb45 100644 |
| 64 |
--- a/pym/_emerge/main.py |
| 65 |
+++ b/pym/_emerge/main.py |
| 66 |
@@ -1681,7 +1681,7 @@ def emerge_main(args=None): |
| 67 |
adjust_configs(myopts, trees) |
| 68 |
apply_priorities(settings) |
| 69 |
|
| 70 |
- if 'force-multilib' in settings.get("FEATURES", ""): |
| 71 |
+ if 'force-multilib' in settings.features: |
| 72 |
if settings.get("NO_AUTO_FLAG", "") is "": |
| 73 |
writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1) |
| 74 |
writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1) |
| 75 |
|
| 76 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 77 |
index e378fcb..0a7010d 100644 |
| 78 |
--- a/pym/portage/dep/dep_check.py |
| 79 |
+++ b/pym/portage/dep/dep_check.py |
| 80 |
@@ -67,7 +67,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 81 |
if repoman: |
| 82 |
x = x._eval_qa_conditionals(use_mask, use_force) |
| 83 |
|
| 84 |
- if 'force-multilib' in mysettings.get("FEATURES", ''): |
| 85 |
+ if 'force-multilib' in mysettings.features: |
| 86 |
if not repoman : |
| 87 |
for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '): |
| 88 |
if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None): |
| 89 |
|
| 90 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 91 |
index cf4e981..e0b84f2 100644 |
| 92 |
--- a/pym/portage/package/ebuild/config.py |
| 93 |
+++ b/pym/portage/package/ebuild/config.py |
| 94 |
@@ -426,6 +426,7 @@ class config(object): |
| 95 |
known_repos = [] |
| 96 |
portdir = "" |
| 97 |
portdir_overlay = "" |
| 98 |
+ features = [] |
| 99 |
for confs in [make_globals, make_conf, self.configdict["env"]]: |
| 100 |
v = confs.get("PORTDIR") |
| 101 |
if v is not None: |
| 102 |
@@ -435,6 +436,9 @@ class config(object): |
| 103 |
if v is not None: |
| 104 |
portdir_overlay = v |
| 105 |
known_repos.extend(shlex_split(v)) |
| 106 |
+ v = confs.get("FEATURES") |
| 107 |
+ if v is not None: |
| 108 |
+ features.append(v.split()) |
| 109 |
known_repos = frozenset(known_repos) |
| 110 |
self["PORTDIR"] = portdir |
| 111 |
self["PORTDIR_OVERLAY"] = portdir_overlay |
| 112 |
@@ -474,7 +478,8 @@ class config(object): |
| 113 |
self.configlist.append(mygcfg) |
| 114 |
self.configdict["defaults"]=self.configlist[-1] |
| 115 |
|
| 116 |
- if 'force-multilib' in confs.get("FEATURES", ""): |
| 117 |
+ features = stack_lists(features) |
| 118 |
+ if 'force-multilib' in features: |
| 119 |
if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 120 |
self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 121 |
|
| 122 |
@@ -791,9 +796,9 @@ class config(object): |
| 123 |
self[var] = default_val |
| 124 |
self.backup_changes(var) |
| 125 |
|
| 126 |
- if 'force-multilib' in self.get("FEATURES", ""): |
| 127 |
+ if 'force-multilib' in features: |
| 128 |
#add multilib_abi internally to list of USE_EXPANDed vars |
| 129 |
- self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "") |
| 130 |
+ self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "") |
| 131 |
self.backup_changes("USE_EXPAND") |
| 132 |
|
| 133 |
# initialize self.features |
| 134 |
@@ -1349,7 +1354,7 @@ class config(object): |
| 135 |
if pkg_defaults: |
| 136 |
defaults.extend(pkg_defaults) |
| 137 |
defaults = " ".join(defaults) |
| 138 |
- if 'force-multilib' in self.get("FEATURES", ""): |
| 139 |
+ if 'force-multilib' in self.features: |
| 140 |
if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 141 |
defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 142 |
if defaults != self.configdict["defaults"].get("USE",""): |
| 143 |
@@ -1589,7 +1594,7 @@ class config(object): |
| 144 |
# FEATURES=test for all ebuilds, regardless of explicit IUSE. |
| 145 |
iuse_implicit.add("test") |
| 146 |
|
| 147 |
- if 'force-multilib' in self.get("FEATURES", ""): |
| 148 |
+ if 'force-multilib' in self.features: |
| 149 |
for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '): |
| 150 |
iuse_implicit.add("multilib_abi_" + multilib_abis) |
| 151 |
|
| 152 |
@@ -2003,8 +2008,6 @@ class config(object): |
| 153 |
|
| 154 |
# Do the USE calculation last because it depends on USE_EXPAND. |
| 155 |
use_expand = self.get("USE_EXPAND", "").split() |
| 156 |
- if 'force-multilib' in self.get("FEATURES", ""): |
| 157 |
- use_expand.append("MULTILIB_ABI") |
| 158 |
use_expand_dict = self._use_expand_dict |
| 159 |
use_expand_dict.clear() |
| 160 |
for k in use_expand: |
| 161 |
|
| 162 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 163 |
index c481818..99de333 100644 |
| 164 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 165 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 166 |
@@ -1639,7 +1639,7 @@ def _post_src_install_write_metadata(settings): |
| 167 |
|
| 168 |
for k in ('IUSE',): |
| 169 |
v = settings.get(k) |
| 170 |
- if "force-multilib" in settings.get('FEATURES'): |
| 171 |
+ if "force-multilib" in settings.features: |
| 172 |
v = v + " abiwrapper" |
| 173 |
for i in settings.get('MULTILIB_ABIS').split(' '): |
| 174 |
v = v + " multilib_abi_" + i |
Archives