diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
| commit | db4a3b0426f4912639c142366ff27594d54ce360 (patch) | |
| tree | fe258d4b663b9607230e456cfa25cdfe29cb3a70 /src/lib/Bcfg2/Server/Plugins/Ohai.py | |
| parent | ed9920711a6020fa01d564db34e0ee4800718cc6 (diff) | |
| parent | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (diff) | |
| download | bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.gz bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.bz2 bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.zip | |
Merge pull request #250 from stpierre/blanket-except-plugins-lint
Remove blanket excepts from plugins and lint
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])) |