commit: 1410c0796fcb79ccb2cba7427621459dff3001a2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Mon Mar 21 10:14:19 2022 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Mon Mar 21 10:14:19 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1410c079
Fix intend Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org> lib/portage/package/ebuild/config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index 198c6238e..95439dedb 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -1194,13 +1194,13 @@ class config: # correct for evaluation of !test? conditionals in RESTRICT. self.regenerate() - if 'force-multilib' in self.features: - #add multilib_abi internally to list of USE_EXPANDed vars - self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "") - self.backup_changes("USE_EXPAND") - default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip() - if default_abi: - self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi + if 'force-multilib' in self.features: + #add multilib_abi internally to list of USE_EXPANDed vars + self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "") + self.backup_changes("USE_EXPAND") + default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip() + if default_abi: + self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi if unprivileged: self.features.add("unprivileged")