diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
| commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
| tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /src/lib/Client/Tools/YUM24.py | |
| parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
| parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
| download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip | |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
Diffstat (limited to 'src/lib/Client/Tools/YUM24.py')
| -rw-r--r-- | src/lib/Client/Tools/YUM24.py | 6 |
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 = {} |