From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACEA515808B for ; Mon, 21 Mar 2022 10:15:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2DCCE0821; Mon, 21 Mar 2022 10:15:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B845E0821 for ; Mon, 21 Mar 2022 10:15:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4A8134302A for ; Mon, 21 Mar 2022 10:15:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C699250 for ; Mon, 21 Mar 2022 10:15:41 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1647857659.1410c0796fcb79ccb2cba7427621459dff3001a2.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/config.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 1410c0796fcb79ccb2cba7427621459dff3001a2 X-VCS-Branch: multilib Date: Mon, 21 Mar 2022 10:15:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aae56e8e-a3ba-4850-9376-9ac07e026619 X-Archives-Hash: 9dd54cc5699cdc151a8ed2c17994d1e7 commit: 1410c0796fcb79ccb2cba7427621459dff3001a2 Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 10:14:19 2022 +0000 Commit: Thomas Sachau gentoo 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 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")