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.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index 89c7107aa..e4fb9b565 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -199,20 +199,19 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                     newnames.add(name.split('.')[0])
                     try:
                         newips.update(self.get_ipcache_entry(name)[0])
-                    except:  # pylint: disable=W0702
+                    except PluginExecutionError:
                         continue
                 names[cmeta.hostname].update(newnames)
                 names[cmeta.hostname].update(cmeta.addresses)
                 names[cmeta.hostname].update(newips)
                 # TODO: Only perform reverse lookups on IPs if an
                 # option is set.
-                if True:
-                    for ip in newips:
-                        try:
-                            names[cmeta.hostname].update(
-                                self.get_namecache_entry(ip))
-                        except:  # pylint: disable=W0702
-                            continue
+                for ip in newips:
+                    try:
+                        names[cmeta.hostname].update(
+                            self.get_namecache_entry(ip))
+                    except socket.gaierror:
+                        continue
                 names[cmeta.hostname] = sorted(names[cmeta.hostname])
 
             pubkeys = [pubk for pubk in list(self.entries.keys())
@@ -309,7 +308,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                          (event.filename, action))
 
     def get_ipcache_entry(self, client):
-        """ Build a cache of dns results. """
+        """Build a cache of dns results."""
         if client in self.ipcache:
             if self.ipcache[client]:
                 return self.ipcache[client]