[yum-commits] 3 commits - docs/yum.8 output.py yum/__init__.py

[James Antill]

 docs/yum.8      |    2 +-
 output.py       |    2 ++
 yum/__init__.py |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b6d499a358ed920619454e325e220dfd7fa9eae4
Author: James Antill <james at and.org>
Date:   Fri Nov 30 12:10:19 2012 -0500

    Fix typo in repoinfo man page.

diff --git a/docs/yum.8 b/docs/yum.8
index 65ff448..604bc26 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -339,7 +339,7 @@ package counts/etc. will be zeroed out).
 .IP
 .IP "\fBrepoinfo\fP"
 .IP
-This ocmmand works exactly like repolist -v.
+This command works exactly like repolist -v.
 .IP
 .IP "\fBversion\fP"
 Produces a "version" of the rpmdb, and of the enabled repositories if "all" is
commit f2e0794a58bd401e7132b3e50444a8b2b232c706
Author: James Antill <james at and.org>
Date:   Mon Nov 19 14:47:23 2012 -0500

    Don't error in history list, when we have no history. BZ 802462.

diff --git a/output.py b/output.py
index 05b255e..885eb09 100755
--- a/output.py
+++ b/output.py
@@ -1973,6 +1973,8 @@ to exit.
         """
         tids, printall = self._history_list_transactions(extcmds)
         if tids is None:
+            if not extcmds: # This is not a real error...
+                return 0, ['No accessible history to list']
             return 1, ['Failed history list']
 
         limit = 20
commit 84722016fe485cb2c13cf3188db3aa5381df6008
Author: James Antill <james at and.org>
Date:   Mon Nov 12 14:39:34 2012 -0500

    Check for possible inf. recursion and workaround in skip-broken. BZ 874065

diff --git a/yum/__init__.py b/yum/__init__.py
index 604ccce..6401645 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1558,6 +1558,8 @@ much more problems).
             for txmbr in self.tsInfo.getMembers(dep.pkgtup):
                 for pkg in (txmbr.updates + txmbr.obsoletes):
                     toRemove.add(pkg)
+            if dep in toRemove: #  If this is true we inf. recurse, so check
+                continue        # even though it shouldn't happen. bz#874065
             toRemove.add(dep)
             self._getDepsToRemove(dep, deptree, toRemove)