diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
commit | 81156aa423309c72f17709eea994e7e06ebc431c (patch) | |
tree | 4ee78fb024c5f03a3c12e39e1adfc1b0cb84063b /cloudinit/config/cc_ssh.py | |
parent | 14040a9c8df6e8406acb79fd653873bb05cb4d40 (diff) | |
parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
download | vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.tar.gz vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.zip |
rebased with upstream and reolved merge conflicts
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!") |