diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:12:30 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:12:30 -0400 |
| commit | 01e785422bdf3fd1457045dcd2e9d8c4aa7304a1 (patch) | |
| tree | 7e9464187639d8d32ba13958d22f7cc853e76e4b | |
| parent | 0e8816f29635786a0fbade95aef1ab8de416f858 (diff) | |
| download | bcfg2-01e785422bdf3fd1457045dcd2e9d8c4aa7304a1.tar.gz bcfg2-01e785422bdf3fd1457045dcd2e9d8c4aa7304a1.tar.bz2 bcfg2-01e785422bdf3fd1457045dcd2e9d8c4aa7304a1.zip | |
Packages: handle bcfg2-yum-helper failures more gracefully
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index bb7caab0d..20b2c9500 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -675,7 +675,10 @@ class YumCollection(Collection): gdicts.append(dict(group=group, type=ptype)) if self.use_yum: - return self.call_helper("get_groups", inputdata=gdicts) + try: + return self.call_helper("get_groups", inputdata=gdicts) + except ValueError: + return dict() else: pkgs = dict() for gdict in gdicts: @@ -838,12 +841,13 @@ class YumCollection(Collection): return Collection.complete(self, packagelist) if packagelist: - result = \ - self.call_helper("complete", - dict(packages=list(packagelist), - groups=list(self.get_relevant_groups()))) - if not result: - # some sort of error, reported by call_helper() + try: + result = self.call_helper( + "complete", + dict(packages=list(packagelist), + groups=list(self.get_relevant_groups()))) + except ValueError: + # error reported by call_helper() return set(), packagelist # json doesn't understand sets or tuples, so we get back a # lists of lists (packages) and a list of unicode strings @@ -905,7 +909,7 @@ class YumCollection(Collection): err = sys.exc_info()[1] self.logger.error("Packages: error reading bcfg2-yum-helper " "output: %s" % err) - return None + raise def setup_data(self, force_update=False): """ Do any collection-level data setup tasks. This is called @@ -931,13 +935,21 @@ class YumCollection(Collection): if force_update: # we call this twice: one to clean up data from the old # config, and once to clean up data from the new config - self.call_helper("clean") + try: + self.call_helper("clean") + except ValueError: + # error reported by call_helper + pass os.unlink(self.cfgfile) self.write_config() if force_update: - self.call_helper("clean") + try: + self.call_helper("clean") + except ValueError: + # error reported by call_helper + pass class YumSource(Source): |