diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-05-12 14:25:32 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2016-05-12 14:25:32 -0700 |
| commit | 78cbc764486060928541b9dee6ce5779e622d1fa (patch) | |
| tree | 48a886ea0a9857ce353eebe504048e656e1c6e92 /cloudinit/config/cc_ssh.py | |
| parent | 690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff) | |
| parent | 811f7b5b3c4590ee4a16662db37b1f37541d9822 (diff) | |
| download | vyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.tar.gz vyos-cloud-init-78cbc764486060928541b9dee6ce5779e622d1fa.zip | |
Enable flake8 and fix a large amount of reported issues
Diffstat (limited to 'cloudinit/config/cc_ssh.py')
| -rw-r--r-- | cloudinit/config/cc_ssh.py | 6 |
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!") |