commit: be981440fe0f5064800b92a1d2effa4094b976a2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:56:13 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:56:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=be981440
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/Package.py | 53 +++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
index 9018b1e52..171ed3e6f 100644
--- a/lib/_emerge/Package.py
+++ b/lib/_emerge/Package.py
@@ -365,32 +365,33 @@ class Package(Task):
)
self._metadata_exception(k, e)
- 'force-multilib' in self.root_config.settings.features:
- mysettings = self.root_config.settings
- no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG",
"").split())
- for i, x in enumerate(validated_atoms):
- if not isinstance(x, Atom):
- continue
- if x.cp in no_auto_flag:
- continue
- multilib_flags = []
- for multilib_abis in
mysettings.get("MULTILIB_ABIS", '').split():
- multilib_flag = 'multilib_abi_' +
multilib_abis
- if x.unevaluated_atom.use is None or \
-
x.unevaluated_atom.use.conditional is None or \
- multilib_flag not in
x.unevaluated_atom.use.conditional.enabled:
-
multilib_flags.append(multilib_flag + '?')
- if multilib_flags:
- if x.unevaluated_atom.use is None:
- use_tokens = []
- else:
- use_tokens =
list(x.unevaluated_atom.use.tokens)
- use_tokens.extend(multilib_flags)
- validated_atoms[i] = Atom(
- x.unevaluated_atom.without_use
+ \
- "[%s]" % (",".join(use_tokens)))
-
-self._validated_atoms = tuple(
+ if self.root_config.settings.local_config and \
+ 'force-multilib' in self.root_config.settings.features:
+ mysettings = self.root_config.settings
+ no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG",
"").split())
+ for i, x in enumerate(validated_atoms):
+ if not isinstance(x, Atom):
+ continue
+ if x.cp in no_auto_flag:
+ continue
+ multilib_flags = []
+ for multilib_abis in mysettings.get("MULTILIB_ABIS",
'').split():
+ multilib_flag = 'multilib_abi_' + multilib_abis
+ if x.unevaluated_atom.use is None or \
+ x.unevaluated_atom.use.conditional is None or \
+ multilib_flag not in
x.unevaluated_atom.use.conditional.enabled:
+ multilib_flags.append(multilib_flag + '?')
+ if multilib_flags:
+ if x.unevaluated_atom.use is None:
+ use_tokens = []
+ else:
+ use_tokens = list(x.unevaluated_atom.use.tokens)
+ use_tokens.extend(multilib_flags)
+ validated_atoms[i] = Atom(
+ x.unevaluated_atom.without_use + \
+ "[%s]" % (",".join(use_tokens)))
+
+ self._validated_atoms = tuple(
set(atom for atom in validated_atoms if isinstance(atom, Atom))
)
