diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-10 18:14:20 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-10 18:14:20 +0200 |
| commit | 283d7406394ef8282c5ab11a71fe0c28e4c8421f (patch) | |
| tree | 2061a7df2c6ceaaef5e1a436ba7073cca42f5439 /src/lib/Bcfg2/Server/Plugins | |
| parent | a133be51f9cb59b9b18dc87a3114e894366dfd12 (diff) | |
| download | bcfg2-283d7406394ef8282c5ab11a71fe0c28e4c8421f.tar.gz bcfg2-283d7406394ef8282c5ab11a71fe0c28e4c8421f.tar.bz2 bcfg2-283d7406394ef8282c5ab11a71fe0c28e4c8421f.zip | |
SSHbase: Use correct exception type
gethostbyaddr() raises socket.herror not socket.gaierror.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 6df16779a..b06e28651 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -210,7 +210,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, try: names[cmeta.hostname].update( self.get_namecache_entry(ip)) - except socket.gaierror: + except socket.herror: continue names[cmeta.hostname] = sorted(names[cmeta.hostname]) @@ -342,7 +342,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, if self.namecache[cip]: return self.namecache[cip] else: - raise socket.gaierror + raise socket.herror else: # add an entry that has not been cached try: @@ -353,7 +353,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, self.namecache[cip] = [] self.namecache[cip].extend(rvlookup[1]) return self.namecache[cip] - except socket.gaierror: + except socket.herror: self.namecache[cip] = False self.logger.error("Failed to find any names associated with " "IP address %s" % cip) |