From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Subject: Re: [gentoo-portage-dev] [PATCH] search: fix addCP so only the specified results are displayed (bug 547736)
Date: Tue, 28 Apr 2015 13:54:00 -0700 [thread overview]
Message-ID: <20150428135400.665fee27.dolsen@gentoo.org> (raw)
In-Reply-To: <1430002040-473-1-git-send-email-zmedico@gentoo.org>
On Sat, 25 Apr 2015 15:47:20 -0700
Zac Medico <zmedico@gentoo.org> wrote:
> 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
> ---
> 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:
Looks good
--
Brian Dolbec <dolsen>
prev parent reply other threads:[~2015-04-28 20:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-25 22:47 [gentoo-portage-dev] [PATCH] search: fix addCP so only the specified results are displayed (bug 547736) Zac Medico
2015-04-28 20:54 ` Brian Dolbec [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150428135400.665fee27.dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-portage-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox