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

[James Antill]

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

New commits:
commit 89443d848ff1673d40ef256508a2a101cd9f7458
Author: James Antill <james at and.org>
Date:   Thu Sep 9 17:17:05 2010 -0400

    Compare repoid nicely in po.__eq__ as well as po.__cmp__.

diff --git a/yum/packages.py b/yum/packages.py
index b5a7d40..e83c0d5 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -290,8 +290,9 @@ class PackageObject(object):
             return False
         if self.pkgtup != other.pkgtup:
             return False
-        if self.repoid != other.repoid:
-            return False
+        if hasattr(self, 'repoid') and hasattr(other, 'repoid'):
+            if self.repoid != other.repoid:
+                return False
         return True
     def __ne__(self, other):
         if not (self == other):
commit 14ec262c163656c4902a65d09f7b514559e202f8
Author: James Antill <james at and.org>
Date:   Thu Sep 9 17:11:06 2010 -0400

    Don't chop names when they are from different transactions.

diff --git a/output.py b/output.py
index 2287b90..ec4bd45 100755
--- a/output.py
+++ b/output.py
@@ -1813,8 +1813,9 @@ to exit.
                      utf8_width_fill(_("Package"), 53, 53))
         print "-" * 79
         fmt = "%6u | %s | %-50s"
-        last = None
         for old in self.history.old(tids):
+            last = None
+
             # Copy and paste from list ... uh.
             rmark = lmark = ' '
             if old.return_code is None: