summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_keys_to_console.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-05-27 09:55:10 -0400
committerScott Moser <smoser@ubuntu.com>2016-05-27 09:55:10 -0400
commit318bd66461cba2f480b2ef6be119d2fcd5c6e9c0 (patch)
tree1817b310efc0190c92c5c95b15df6491119233ce /cloudinit/config/cc_keys_to_console.py
parent949cebd48c9100d4fd00b74232bcf048980e6e0d (diff)
parent0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff)
downloadvyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.tar.gz
vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.zip
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_keys_to_console.py')
-rw-r--r--cloudinit/config/cc_keys_to_console.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py
index aa844ee9..9a02f056 100644
--- a/cloudinit/config/cc_keys_to_console.py
+++ b/cloudinit/config/cc_keys_to_console.py
@@ -57,6 +57,6 @@ def handle(name, cfg, cloud, log, _args):
(stdout, _stderr) = util.subp(cmd)
util.multi_log("%s\n" % (stdout.strip()),
stderr=False, console=True)
- except:
+ except Exception:
log.warn("Writing keys to the system console failed!")
raise