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

[Tim Lauridsen]

 output.py       |    4 +++-
 yum/__init__.py |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 456dc3456721a5038b727b45ffb86e55686ed469
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Mon Oct 27 14:16:47 2008 +0100

    Added skipped packages to transaction overview

diff --git a/output.py b/output.py
index 79d8bb0..d7356ce 100644
--- a/output.py
+++ b/output.py
@@ -778,7 +778,8 @@ class YumOutput:
                             (_('Removing'), self.tsInfo.removed),
                             (_('Installing for dependencies'), self.tsInfo.depinstalled),
                             (_('Updating for dependencies'), self.tsInfo.depupdated),
-                            (_('Removing for dependencies'), self.tsInfo.depremoved)]:
+                            (_('Removing for dependencies'), self.tsInfo.depremoved),
+                            (_('Skipped (dependency problems)'), self.skipped_packages),]:
             lines = []
             for txmbr in pkglist:
                 (n,a,e,v,r) = txmbr.pkgtup
@@ -889,6 +890,7 @@ Remove   %5.5s Package(s)
                                   (_('Dependency Installed'), self.tsInfo.depinstalled),
                                   (_('Updated'), self.tsInfo.updated),
                                   (_('Dependency Updated'), self.tsInfo.depupdated),
+                                  (_('Skipped (dependency problems)'), self.skipped_packages),
                                   (_('Replaced'), self.tsInfo.obsoleted)]:
             msgs = []
             if len(pkglist) > 0:
diff --git a/yum/__init__.py b/yum/__init__.py
index ae2bd67..7c8c57a 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -97,7 +97,7 @@ class YumBase(depsolve.Depsolve):
         self._comps = None
         self._pkgSack = None
         self._lockfile = None
-        self.skipped_packages = None    # packages skip by the skip-broken code
+        self.skipped_packages = []   # packages skip by the skip-broken code
         self.logger = logging.getLogger("yum.YumBase")
         self.verbose_logger = logging.getLogger("yum.verbose.YumBase")
         self._repos = RepoStorage(self)
@@ -664,7 +664,7 @@ class YumBase(depsolve.Depsolve):
         # The remove the broken packages from the transactions and
         # Try another depsolve
         if self.conf.skip_broken and rescode==1:
-            self.skipped_packages = None    # reset the public list of skipped packages.
+            self.skipped_packages = []    # reset the public list of skipped packages.
             rescode, restring = self._skipPackagesWithProblems(rescode, restring)
 
         self.verbose_logger.debug('Depsolve time: %0.3f' % (time.time() - ds_st))