summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-19 10:04:06 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-19 10:04:13 -0400
commitead3723f443f37d97cb45d26fddaaaa013f5edfa (patch)
treec0a92ee7942f1b636ca161eb5db88bbbc2b51e71 /src
parentc9fc434248ff3f8c1b800ced559385b17d4690de (diff)
downloadbcfg2-ead3723f443f37d97cb45d26fddaaaa013f5edfa.tar.gz
bcfg2-ead3723f443f37d97cb45d26fddaaaa013f5edfa.tar.bz2
bcfg2-ead3723f443f37d97cb45d26fddaaaa013f5edfa.zip
Yum: fixed logging bcfg2-yum-helper error output
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Yum.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 4330de971..4608bcca5 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -904,11 +904,13 @@ class YumCollection(Collection):
rv = helper.wait()
errlines = stderr.splitlines()
if rv:
+ if not errlines:
+ errlines.append("No error output")
self.logger.error("Packages: error running bcfg2-yum-helper "
"(returned %d): %s" % (rv, errlines[0]))
for line in errlines[1:]:
self.logger.error("Packages: %s" % line)
- else:
+ elif errlines:
self.debug_log("Packages: debug info from bcfg2-yum-helper: %s" %
errlines[0])
for line in errlines[1:]: