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

[James Antill]

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

New commits:
commit d4b0e478d0813a97e3c09a6c0fd6fee802480ebf
Author: James Antill <james at and.org>
Date:   Tue Sep 29 15:04:51 2009 -0400

    Show obsoletes in check-update if obsoletes processing is on, BZ 526064

diff --git a/yumcommands.py b/yumcommands.py
index 82c679b..1451a36 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -577,7 +577,8 @@ class CheckUpdateCommand(YumCommand):
         result = 0
         try:
             ypl = base.returnPkgLists(extcmds)
-            if base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3):
+            if (base.conf.obsoletes or
+                base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)):
                 typl = base.returnPkgLists(['obsoletes'])
                 ypl.obsoletes = typl.obsoletes
                 ypl.obsoletesTuples = typl.obsoletesTuples
commit 83978a0befeae993de75c70a7af291395afcff5d
Author: James Antill <james at and.org>
Date:   Tue Sep 29 15:02:32 2009 -0400

     Convert all errors to strings, for history to log them. BZ 526294
    
     Main problem here is crap comes out of rpm. We really want just [0] for
    disk space errors ... but alas. other stuff isn't like that.
     We could try and inspect the data, and guess what error it is, but just
    dumping it all out works fine atm.

diff --git a/yum/__init__.py b/yum/__init__.py
index e645e22..6e06005 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -65,7 +65,7 @@ warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
 from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
 from constants import *
 from rpmtrans import RPMTransaction,SimpleCliCallBack
-from i18n import to_unicode
+from i18n import to_unicode, to_str
 
 import string
 
@@ -1078,7 +1078,8 @@ class YumBase(depsolve.Depsolve):
             resultobject.return_code = 1
         else:
             if self.conf.history_record:
-                self.history.end(rpmdbv, 2, errors=errors)
+                herrors = [to_unicode(to_str(x)) for x in errors]
+                self.history.end(rpmdbv, 2, errors=herrors)
             raise Errors.YumBaseError, errors
                           
         if not self.conf.keepcache: