diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-12-09 11:10:24 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:24:24 -0600 |
| commit | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (patch) | |
| tree | ed4623b5c6e39d80c132e9f21f3d4804cabd93be /src/lib/Bcfg2/Server/Plugins/Ohai.py | |
| parent | 64b458b380620f84843b1841b441745a0984946f (diff) | |
| download | bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.gz bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.bz2 bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.zip | |
Remove blanket excepts from plugins and lint
This removes most blanket except: clauses from all plugins, including
the base plugin libraries, and bcfg2-lint. The few that remain should
all be necessary.
Most of the changes were quite minor, but this did require some
restructuring of the CfgPrivateKeyCreator; as a result, the tests for
that module were rewritten.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index c5fb46c97..461be9ba8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py @@ -51,7 +51,7 @@ class OhaiCache(object): if item not in self.cache: try: data = open(self.hostpath(item)).read() - except: + except IOError: raise KeyError(item) self.cache[item] = json.loads(data) return self.cache[item] @@ -61,7 +61,7 @@ class OhaiCache(object): del self.cache[item] try: os.unlink(self.hostpath(item)) - except: + except OSError: raise IndexError("Could not unlink %s: %s" % (self.hostpath(item), sys.exc_info()[1])) |