summaryrefslogtreecommitdiffstats
path: root/src/lib/Client/Tools/YUM24.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-06-15 14:15:52 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-06-15 14:15:52 -0500
commit7be5239be45d6ee52d0b80d2a5993d3bdb6b933b (patch)
treeede82277589dd5ec980c0dee8490252255f48d29 /src/lib/Client/Tools/YUM24.py
parenta1bc75c200fb9237ecc0dd5ccd5b8bf94214cf4b (diff)
downloadbcfg2-7be5239be45d6ee52d0b80d2a5993d3bdb6b933b.tar.gz
bcfg2-7be5239be45d6ee52d0b80d2a5993d3bdb6b933b.tar.bz2
bcfg2-7be5239be45d6ee52d0b80d2a5993d3bdb6b933b.zip
Client Tools: Add PY3K compatibility
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Client/Tools/YUM24.py')
-rw-r--r--src/lib/Client/Tools/YUM24.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/YUM24.py b/src/lib/Client/Tools/YUM24.py
index 5387fdd6a..66768fb34 100644
--- a/src/lib/Client/Tools/YUM24.py
+++ b/src/lib/Client/Tools/YUM24.py
@@ -1,13 +1,14 @@
"""This provides bcfg2 support for yum."""
__revision__ = '$Revision: $'
-import ConfigParser
import copy
import os.path
import sys
import yum
import Bcfg2.Client.XML
import Bcfg2.Client.Tools.RPMng
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
# Fix for python2.3
try:
@@ -151,7 +152,8 @@ class YUM24(Bcfg2.Client.Tools.RPMng.RPMng):
try:
pkgDict = dict([(i.name, i) for i in \
self.yb.returnPackagesByDep(entry.get('name'))])
- except yum.Errors.YumBaseError, e:
+ except yum.Errors.YumBaseError:
+ e = sys.exc_info()[1]
self.logger.error('Yum Error Depsolving for %s: %s' % \
(entry.get('name'), str(e)))
pkgDict = {}