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/RPMng.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/RPMng.py')
-rw-r--r-- | src/lib/Client/Tools/RPMng.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index a1e14b3a6..5376118c2 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -2,11 +2,12 @@ __revision__ = '$Revision$' -import ConfigParser import os.path import rpm import rpmtools import Bcfg2.Client.Tools +# Compatibility import +from Bcfg2.Bcfg2Py3k import ConfigParser # Fix for python2.3 try: |