From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CCF00138C9D for ; Tue, 28 Apr 2015 23:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49CB0E0822; Tue, 28 Apr 2015 23:52:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7621E0822 for ; Tue, 28 Apr 2015 23:52:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A569F340CB2 for ; Tue, 28 Apr 2015 23:52:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EF99977 for ; Tue, 28 Apr 2015 23:52:40 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1430264968.37453ccdfc2dad1bb21d79a596655b614264fee9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/search.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 37453ccdfc2dad1bb21d79a596655b614264fee9 X-VCS-Branch: master Date: Tue, 28 Apr 2015 23:52:40 +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-Archives-Salt: b03ceb5c-4979-48f6-9b49-05f57feedaac X-Archives-Hash: ec299bff6a840a3f8bde913ebcc704c0 commit: 37453ccdfc2dad1bb21d79a596655b614264fee9 Author: Zac Medico gentoo org> AuthorDate: Sat Apr 25 22:44:25 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 28 23:49:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=37453ccd search: fix addCP so only the specified results are displayed (bug 547736) Since commit 4938b8a8a72e719b394a5c5b0c5030c160091d57, the search.addCP method has not worked as intended. Fixes: 4938b8a8a72e ("Display emerge search results incrementally (412471)") X-Gentoo-Bug: 547736 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=547736 Acked-by: Brian Dolbec gentoo.org> pym/_emerge/search.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py index 5a8143c..41c182d 100644 --- a/pym/_emerge/search.py +++ b/pym/_emerge/search.py @@ -36,6 +36,7 @@ class search(object): self.verbose = verbose self.searchdesc = searchdesc self.searchkey = None + self._results_specified = False # Disable the spinner since search results are displayed # incrementally. self.spinner = None @@ -295,6 +296,12 @@ class search(object): yield ("set", setname) def addCP(self, cp): + """ + Add a specific cp to the search results. This modifies the + behavior of the output method, so that it only displays specific + packages added via this method. + """ + self._results_specified = True if not self._xmatch("match-all", cp): return self.matches["pkg"].append(cp) @@ -315,11 +322,12 @@ class search(object): metadata_keys.update(["DESCRIPTION", "HOMEPAGE", "LICENSE", "SRC_URI"]) metadata_keys = tuple(metadata_keys) - if self.searchkey is None: + if self._results_specified: # Handle results added via addCP addCP_matches = [] - for mytype, match in self.matches.items(): - addCP_matches.append(mytype, match) + for mytype, matches in self.matches.items(): + for match in matches: + addCP_matches.append((mytype, match)) iterator = iter(addCP_matches) else: