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 ADDA415800A for ; Tue, 18 Jul 2023 22:30:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE207E07E6; Tue, 18 Jul 2023 22:30:10 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE470E07E6 for ; Tue, 18 Jul 2023 22:30:10 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 922E4340E1A for ; Tue, 18 Jul 2023 22:30:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F1D8B9C for ; Tue, 18 Jul 2023 22:30:07 +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: <1689719324.637bfbfb27d2104a81d80e5c67a7878d2e874966.sam@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/equery/list_.py X-VCS-Directories: pym/gentoolkit/equery/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 637bfbfb27d2104a81d80e5c67a7878d2e874966 X-VCS-Branch: master Date: Tue, 18 Jul 2023 22:30:07 +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: 46b4dc04-0fd0-4e27-b1b4-2db2fd76712d X-Archives-Hash: ad7cb90db49b0d396dade46ecacdaabb commit: 637bfbfb27d2104a81d80e5c67a7878d2e874966 Author: Rafał Mużyło o2 pl> AuthorDate: Tue Jul 18 22:28:44 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 18 22:28:44 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=637bfbfb equery: list: correctly handle installed packages no longer in tree Closes: https://bugs.gentoo.org/369581 Signed-off-by: Sam James gentoo.org> pym/gentoolkit/equery/list_.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/equery/list_.py b/pym/gentoolkit/equery/list_.py index 1e03d91..9b38c3e 100644 --- a/pym/gentoolkit/equery/list_.py +++ b/pym/gentoolkit/equery/list_.py @@ -233,10 +233,10 @@ def main(input_args): ) if QUERY_OPTS["in_porttree"] and not QUERY_OPTS["in_overlay"]: - if not "P" in pkgstr.location: + if not ("P" in pkgstr.location or (QUERY_OPTS['in_installed'] and 'I' in pkgstr.location)): continue if QUERY_OPTS["in_overlay"] and not QUERY_OPTS["in_porttree"]: - if not "O" in pkgstr.location: + if not ("O" in pkgstr.location or (QUERY_OPTS['in_installed'] and 'I' in pkgstr.location)): continue pp.uprint(pkgstr)