diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-05 13:44:57 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-05 14:51:45 -0400 |
| commit | e1f045ff3c56b09ff06e11e6d4f9677bf63d051f (patch) | |
| tree | ced7963c4200c922f3ff115c43dd9e4b822284db /src/lib/Bcfg2/Server/Plugins/Packages | |
| parent | 7f749ab48d798db7773a7b05f28caf6f9a28ee48 (diff) | |
| download | bcfg2-e1f045ff3c56b09ff06e11e6d4f9677bf63d051f.tar.gz bcfg2-e1f045ff3c56b09ff06e11e6d4f9677bf63d051f.tar.bz2 bcfg2-e1f045ff3c56b09ff06e11e6d4f9677bf63d051f.zip | |
Yum: better errors when yum helper output isn't valid JSON
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 4187f2812..66f8e9dbe 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -946,9 +946,14 @@ class YumCollection(Collection): try: return json.loads(result.stdout) except ValueError: - err = sys.exc_info()[1] - self.logger.error("Packages: error reading bcfg2-yum-helper " - "output: %s" % err) + if result.stdout: + err = sys.exc_info()[1] + self.logger.error("Packages: Error reading bcfg2-yum-helper " + "output: %s" % err) + self.logger.error("Packages: bcfg2-yum-helper output: %s" % + result.stdout) + else: + self.logger.error("Packages: No bcfg2-yum-helper output") raise def setup_data(self, force_update=False): |