[yum-commits] Branch 'yum-3_2_X' - 3 commits - cli.py yum/__init__.py

[skvidal at osuosl.org]

 cli.py          |    3 +++
 yum/__init__.py |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 144829fa10909cb749ab67e3793f8dd9e80aed4c
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu May 6 14:07:08 2010 -0400

    use the fmtKeyValFill for the output of repos

diff --git a/cli.py b/cli.py
index 0d6f6dd..2f1479b 100644
--- a/cli.py
+++ b/cli.py
@@ -1014,11 +1014,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
     def cleanCli(self, userlist):
         hdrcode = pkgcode = xmlcode = dbcode = expccode = 0
         pkgresults = hdrresults = xmlresults = dbresults = expcresults = []
-        self.verbose_logger.log(yum.logginglevels.INFO_2,
-            _('Cleaning requested data in enabled repos:'))
-        for repo in self.repos.listEnabled():
-            self.verbose_logger.log(yum.logginglevels.INFO_2,
-                      _('  %s') % repo.id )
+        msg = self.fmtKeyValFill(_('Cleaning repos: '), 
+                        ' '.join([ x.id for x in self.repos.listEnabled()]))
+        self.verbose_logger.log(yum.logginglevels.INFO_2, msg)
         if 'all' in userlist:
             self.verbose_logger.log(yum.logginglevels.INFO_2,
                 _('Cleaning up Everything'))
commit 0325fb088059b82788e81489b74895c2d72c48c1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu May 6 11:14:40 2010 -0400

    output list of repos being cleaned up for when we clean.

diff --git a/cli.py b/cli.py
index fc91de2..0d6f6dd 100644
--- a/cli.py
+++ b/cli.py
@@ -1014,6 +1014,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
     def cleanCli(self, userlist):
         hdrcode = pkgcode = xmlcode = dbcode = expccode = 0
         pkgresults = hdrresults = xmlresults = dbresults = expcresults = []
+        self.verbose_logger.log(yum.logginglevels.INFO_2,
+            _('Cleaning requested data in enabled repos:'))
+        for repo in self.repos.listEnabled():
+            self.verbose_logger.log(yum.logginglevels.INFO_2,
+                      _('  %s') % repo.id )
         if 'all' in userlist:
             self.verbose_logger.log(yum.logginglevels.INFO_2,
                 _('Cleaning up Everything'))
commit 99cb2b49b5de22edf923863b36a0cfe5daae534f
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu May 6 10:58:46 2010 -0400

    add --enablerepo to suggestion for handling package not matching
    what is expected to be downloaded.
    deals with folks installing debuginfo pkgs but not have debug repos enabled
    when they run clean metadata

diff --git a/yum/__init__.py b/yum/__init__.py
index 64663cc..d2a3a76 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1584,7 +1584,7 @@ class YumBase(depsolve.Depsolve):
                     os.unlink(fo)
 
             if raiseError:
-                msg = _('Package does not match intended download. Suggestion: run yum clean metadata')
+                msg = _('Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata') %  po.repo.id 
                 raise URLGrabError(-1, msg)
             else:
                 return False