[Yum-devel] [PATCH 2/2] Some more str(e) => exception2msg(e) fixes.

[Zdeněk Pavlas]

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

diff --git a/cli.py b/cli.py
index 43c0e1d..00374d8 100755
--- a/cli.py
+++ b/cli.py
@@ -43,7 +43,7 @@ from yum.rpmtrans import RPMTransaction
 import signal
 import yumcommands
 
-from yum.i18n import to_unicode, to_utf8
+from yum.i18n import to_unicode, to_utf8, exception2msg
 
 #  This is for yum-utils/yumdownloader in RHEL-5, where it isn't importing this
 # directly but did do "from cli import *", and we did have this in 3.2.22. I
@@ -457,7 +457,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
             try:
                 self._getTs(needTsRemove)
             except yum.Errors.YumBaseError, e:
-                return 1, [str(e)]
+                return 1, [exception2msg(e)]
 
         return self.yum_cli_commands[self.basecmd].doCommand(self, self.basecmd, self.extcmds)
 
diff --git a/yum/__init__.py b/yum/__init__.py
index b7808bd..2a8e278 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -82,7 +82,7 @@ from packages import YumAvailablePackage, YumLocalPackage, YumInstalledPackage
 from packages import YumUrlPackage, YumNotFoundPackage
 from constants import *
 from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
-from yum.i18n import to_unicode, to_str
+from yum.i18n import to_unicode, to_str, exception2msg
 
 import string
 import StringIO
@@ -2027,7 +2027,7 @@ class YumBase(depsolve.Depsolve):
                 done_repos.add(po.repoid)
 
             except Errors.RepoError, e:
-                adderror(po, str(e))
+                adderror(po, exception2msg(e))
             else:
                 po.localpath = mylocal
                 if po in errors:
-- 
1.7.4.4