[yum-git] Branch 'yum-3_2_X' - cli.py

[James Antill]

 cli.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5ce6607fe1454cb0ff1de85a4a810558e1faaaea
Author: James Antill <james at and.org>
Date:   Mon Aug 18 01:29:12 2008 -0400

    Suggest installed pkgs too, in "maybe you meant" output

diff --git a/cli.py b/cli.py
index 525df1a..e244d2f 100644
--- a/cli.py
+++ b/cli.py
@@ -529,14 +529,13 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
             except yum.Errors.InstallError:
                 self.verbose_logger.log(yum.logginglevels.INFO_2,
                                         _('No package %s available.'), arg)
-                matches = self.doPackageLists('available', patterns=[arg],
-                                              ignore_case=True)
+                matches = self.doPackageLists(patterns=[arg], ignore_case=True)
                 #  The problem here is that if this is the second time around
                 # then we've already pre-cached the results from doPackageLists
                 # to be all the available pkgs. So we need to match.
                 # FIXME: Really we should probably put this in
                 # doPackageLists() / returnPackages() when we have a pattern.
-                matches = matches.available
+                matches = matches.installed + matches.available
                 exactmatch, matched, unmatched = parsePackages(matches, [arg])
                 matches = yum.misc.unique(exactmatch + matched)
                 matches = set(map(lambda x: x.name, matches))