diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-10-01 17:36:23 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-10-02 12:47:53 +0100 |
| commit | 2b0a904f6b3e0376d0ee2359469d8732c11e376b (patch) | |
| tree | f517887afa9c5ae8f7b05c143c9b034b362ad6cd | |
| parent | Remove obsolete _eintr_func_wrapper (diff) | |
| download | portage-2b0a904f.tar.gz portage-2b0a904f.tar.bz2 portage-2b0a904f.zip | |
search: fix 'mlen' counter for ambiguous package names
self.mlen was being incremented in both addCP() and output().
Drop the increment in addCP(), and convert mlen to a function-local
variable in output().
Bug: https://bugs.gentoo.org/915054
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1106
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/_emerge/search.py | 14 |
2 files changed, 6 insertions, 11 deletions
@@ -28,6 +28,9 @@ Bug fixes: * dispatch-conf, etc-update: fix SELinux security labels on merged files. +* emerge: fix application count when listing search results for ambiguous + packages (bug #915054). + Cleanups: * vartree: Remove unused variables and parameters diff --git a/lib/_emerge/search.py b/lib/_emerge/search.py index e422434a7..62406258d 100644 --- a/lib/_emerge/search.py +++ b/lib/_emerge/search.py @@ -57,7 +57,6 @@ class search: self.fuzzy = fuzzy self.search_similarity = 80 if search_similarity is None else search_similarity self.matches = {"pkg": []} - self.mlen = 0 self._dbs = [] @@ -377,7 +376,6 @@ class search: if not self._xmatch("match-all", cp): return self.matches["pkg"].append(cp) - self.mlen += 1 def output(self): """Outputs the results of the search.""" @@ -407,8 +405,9 @@ class search: # Do a normal search iterator = self._iter_search() + mlen = 0 for mtype, match in iterator: - self.mlen += 1 + mlen += 1 masked = False full_package = None if mtype in ("pkg", "desc"): @@ -521,14 +520,7 @@ class search: " " + darkgreen("License:") + " " + license + "\n\n" ) - msg.append("[ Applications found : " + bold(str(self.mlen)) + " ]\n\n") - - # This method can be called multiple times, so - # reset the match count for the next call. Don't - # reset it at the beginning of this method, since - # that would lose modfications from the addCP - # method. - self.mlen = 0 + msg.append("[ Applications found : " + bold(str(mlen)) + " ]\n\n") # # private interface |