summaryrefslogtreecommitdiff
path: root/cloudinit/ssh_util.py
diff options
context:
space:
mode:
authorJuerg Haefliger <juergh@gmail.com>2013-06-19 08:44:00 +0200
committerJuerg Haefliger <juergh@gmail.com>2013-06-19 08:44:00 +0200
commit944623f4ad3e4c7319758c64053d06a3b05555a2 (patch)
treec8766adf057692157a0c454ac24a02a9fc5022f1 /cloudinit/ssh_util.py
parent812f82e7b3bad3f8127face552c76ef974b54661 (diff)
downloadvyos-cloud-init-944623f4ad3e4c7319758c64053d06a3b05555a2.tar.gz
vyos-cloud-init-944623f4ad3e4c7319758c64053d06a3b05555a2.zip
fix and cleanup usage of util.logexc
Diffstat (limited to 'cloudinit/ssh_util.py')
-rw-r--r--cloudinit/ssh_util.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index 95133236..70a577bc 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -229,11 +229,9 @@ def extract_authorized_keys(username):
except (IOError, OSError):
# Give up and use a default key filename
auth_key_fn = os.path.join(ssh_dir, 'authorized_keys')
- util.logexc(LOG, ("Failed extracting 'AuthorizedKeysFile'"
- " in ssh config"
- " from %r, using 'AuthorizedKeysFile' file"
- " %r instead"),
- DEF_SSHD_CFG, auth_key_fn)
+ util.logexc(LOG, "Failed extracting 'AuthorizedKeysFile' in ssh "
+ "config from %r, using 'AuthorizedKeysFile' file "
+ "%r instead", DEF_SSHD_CFG, auth_key_fn)
return (auth_key_fn, parse_authorized_keys(auth_key_fn))