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 256A1158089 for ; Mon, 6 Nov 2023 15:58:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D112BC016; Mon, 6 Nov 2023 15:58:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E3392BC016 for ; Mon, 6 Nov 2023 15:58:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33C89335CDF for ; Mon, 6 Nov 2023 15:58:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A643D1322 for ; Mon, 6 Nov 2023 15:58:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699286276.a6853d5493b7bed37e60c2e3b7536b209500ba3f.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/depgraph.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6853d5493b7bed37e60c2e3b7536b209500ba3f X-VCS-Branch: master Date: Mon, 6 Nov 2023 15:58:00 +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: 20d20350-ec37-4a42-89a0-303d6ed94e8c X-Archives-Hash: fe878a8ec4d3e26c30c6adf97d232b87 commit: a6853d5493b7bed37e60c2e3b7536b209500ba3f Author: Sam James gentoo org> AuthorDate: Thu Nov 2 13:59:05 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 6 15:57:56 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a6853d54 emerge: account for EROOT in _show_ignored_binaries_respect_use Zac suggested this when reviewing the fix for bug #916336. Bug: https://bugs.gentoo.org/916336 Signed-off-by: Sam James gentoo.org> lib/_emerge/depgraph.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 0717e0429f..d1fed0d652 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -1235,23 +1235,28 @@ class depgraph: seen = {} messages = [] merging = { - pkg.cpv + (pkg.root, pkg.cpv) for pkg in self._dynamic_config._displayed_list if isinstance(pkg, Package) } for pkg, flags in respect_use.items(): # Don't include recursive deps which aren't in the merge list anyway. - if pkg.cpv not in merging: + if (pkg.root, pkg.cpv) not in merging: continue + flag_display = [] for flag in sorted(flags): if flag not in pkg.use.enabled: flag = "-" + flag flag_display.append(flag) flag_display = " ".join(flag_display) + # We don't want to list the same USE flags for multiple build IDs - if pkg.cpv not in seen or flag_display not in seen[pkg.cpv]: - seen.setdefault(pkg.cpv, set()).add(flag_display) + seen.setdefault(pkg.root, dict()) + if (pkg.root, pkg.cpv) not in seen or flag_display not in seen[pkg.root][ + pkg.cpv + ]: + seen[pkg.root].setdefault(pkg.cpv, set()).add(flag_display) # The user can paste this line into package.use messages.append(f" ={pkg.cpv} {flag_display}") if pkg.root_config.settings["ROOT"] != "/":