diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-05-27 09:55:10 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-05-27 09:55:10 -0400 |
| commit | 318bd66461cba2f480b2ef6be119d2fcd5c6e9c0 (patch) | |
| tree | 1817b310efc0190c92c5c95b15df6491119233ce /cloudinit/config/cc_ssh_import_id.py | |
| parent | 949cebd48c9100d4fd00b74232bcf048980e6e0d (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.tar.gz vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_ssh_import_id.py')
| -rw-r--r-- | cloudinit/config/cc_ssh_import_id.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py index 2d480d7e..28c4585b 100644 --- a/cloudinit/config/cc_ssh_import_id.py +++ b/cloudinit/config/cc_ssh_import_id.py @@ -52,14 +52,14 @@ def handle(_name, cfg, cloud, log, args): else: try: import_ids = user_cfg['ssh_import_id'] - except: + except Exception: log.debug("User %s is not configured for ssh_import_id", user) continue try: import_ids = util.uniq_merge(import_ids) import_ids = [str(i) for i in import_ids] - except: + except Exception: log.debug("User %s is not correctly configured for ssh_import_id", user) continue |