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

[James Antill]

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

New commits:
commit ad14103bd199008f42c8e17664d8f6f7063227ce
Author: James Antill <james at and.org>
Date:   Tue Dec 2 20:04:13 2008 -0500

    Work around for the crazy rpm package summaries bug, BZ 473239

diff --git a/yum/packages.py b/yum/packages.py
index 48dfc8d..acfb9f0 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -978,7 +978,9 @@ class YumHeaderPackage(YumAvailablePackage):
         self.ver = self.version
         self.rel = self.release
         self.pkgtup = (self.name, self.arch, self.epoch, self.version, self.release)
-        self.summary = misc.share_data(self.hdr['summary'].replace('\n', ''))
+        # Summaries "can be" empty, which rpm return [], see BZ 473239, *sigh*
+        self.summary = self.hdr['summary'] or ''
+        self.summary = misc.share_data(self.summary.replace('\n', ''))
         self.description = misc.share_data(self.hdr['description'])
         self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER]
         if not self.pkgid:
commit 04e40bd548a25d226084f99774daff85ebaace40
Author: James Antill <james at and.org>
Date:   Mon Dec 1 12:06:28 2008 -0500

    Make lastmsg a unicode string so we can do == tests, fixes Fedora BZ 473328

diff --git a/output.py b/output.py
index 4f7a6cf..b6bd005 100755
--- a/output.py
+++ b/output.py
@@ -1216,7 +1216,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
 
     def __init__(self):
         RPMBaseCallback.__init__(self)
-        self.lastmsg = None
+        self.lastmsg = to_unicode("")
         self.lastpackage = None # name of last package we looked at
         self.output = logging.getLogger("yum.verbose.cli").isEnabledFor(logginglevels.INFO_2)