summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-12-02 12:56:54 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-12-02 12:56:54 -0500
commitd4d389f9e12074914c6e7327a5abba2d47501964 (patch)
tree42b063f5ac76a5f15aa70635426254a174fe77a4
parentbb7cd87ff9a7b682f18d0fc52cad2e10e3326d8d (diff)
downloadbcfg2-d4d389f9e12074914c6e7327a5abba2d47501964.tar.gz
bcfg2-d4d389f9e12074914c6e7327a5abba2d47501964.tar.bz2
bcfg2-d4d389f9e12074914c6e7327a5abba2d47501964.zip
make yum debug level adjustments work with older yum
-rw-r--r--src/lib/Client/Tools/YUMng.py14
-rwxr-xr-xsrc/sbin/bcfg2-yum-helper7
2 files changed, 15 insertions, 6 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index bd8b7c653..a018e68fb 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -149,12 +149,18 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
self.yb = yum.YumBase()
if setup['debug']:
- self.yb.preconf.debuglevel = 3
+ debuglevel = 3
elif setup['verbose']:
- self.yb.preconf.debuglevel = 2
+ debuglevel = 2
else:
- self.yb.preconf.debuglevel = 1
-
+ debuglevel = 1
+
+ try:
+ self.yb.preconf.debuglevel = debuglevel
+ except AttributeError:
+ self.yb._getConfig(self.yb.config_file_path,
+ debuglevel=debuglevel)
+
Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
self.ignores = [entry.get('name') for struct in config \
for entry in struct \
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index e0ba02382..94836d748 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -25,8 +25,11 @@ class DepSolver(object):
def __init__(self, cfgfile, verbose=1):
self.cfgfile = cfgfile
self.yumbase = yum.YumBase()
- self.yumbase.preconf.debuglevel = verbose
- self.yumbase.preconf.fn = cfgfile
+ try:
+ self.yumbase.preconf.debuglevel = verbose
+ self.yumbase.preconf.fn = cfgfile
+ except AttributeError:
+ self.yumbase._getConfig(cfgfile, debuglevel=verbose)
def get_groups(self):
try: