summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_ssh.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
commitf11827aee59cf2678c3d2a157218a3fe2831f5c2 (patch)
tree94c8f39d66d003b7d0d211dd521b64b5041287b3 /cloudinit/config/cc_ssh.py
parent690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff)
downloadvyos-cloud-init-f11827aee59cf2678c3d2a157218a3fe2831f5c2.tar.gz
vyos-cloud-init-f11827aee59cf2678c3d2a157218a3fe2831f5c2.zip
Fix up a ton of flake8 issues
Diffstat (limited to 'cloudinit/config/cc_ssh.py')
-rw-r--r--cloudinit/config/cc_ssh.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py
index d24e43c0..cb9b70aa 100644
--- a/cloudinit/config/cc_ssh.py
+++ b/cloudinit/config/cc_ssh.py
@@ -57,7 +57,7 @@ def handle(_name, cfg, cloud, log, _args):
for f in glob.glob(key_pth):
try:
util.del_file(f)
- except:
+ except Exception:
util.logexc(log, "Failed deleting key file %s", f)
if "ssh_keys" in cfg:
@@ -78,7 +78,7 @@ def handle(_name, cfg, cloud, log, _args):
with util.SeLinuxGuard("/etc/ssh", recursive=True):
util.subp(cmd, capture=False)
log.debug("Generated a key for %s from %s", pair[0], pair[1])
- except:
+ except Exception:
util.logexc(log, "Failed generated a key for %s from %s",
pair[0], pair[1])
else:
@@ -122,7 +122,7 @@ def handle(_name, cfg, cloud, log, _args):
keys.extend(cfgkeys)
apply_credentials(keys, user, disable_root, disable_root_opts)
- except:
+ except Exception:
util.logexc(log, "Applying ssh credentials failed!")