diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-17 12:42:44 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-17 12:42:44 -0500 |
| commit | 2f7227c7092ad873757167f62c2a82fb4ee69472 (patch) | |
| tree | acc620e1f0423910a4d0ea0d79ee231290e4a393 /cloudinit/CloudConfig/cc_ssh_import_id.py | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| parent | ec070cdf8746651d6dea011bd3ea9a445223028c (diff) | |
| download | vyos-cloud-init-2f7227c7092ad873757167f62c2a82fb4ee69472.tar.gz vyos-cloud-init-2f7227c7092ad873757167f62c2a82fb4ee69472.zip | |
fix pylint warnings (LP: #914739) [Juerg Haefliger]
This merge pulls in Jeurg's 'fix-pylint-warnings.tgz' patchset from
LP: #914739.
Diffstat (limited to 'cloudinit/CloudConfig/cc_ssh_import_id.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_ssh_import_id.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_ssh_import_id.py b/cloudinit/CloudConfig/cc_ssh_import_id.py index 7e7a54a1..efcd4296 100644 --- a/cloudinit/CloudConfig/cc_ssh_import_id.py +++ b/cloudinit/CloudConfig/cc_ssh_import_id.py @@ -19,17 +19,18 @@ import cloudinit.util as util import subprocess import traceback -def handle(_name,cfg,_cloud,log,args): +def handle(_name, cfg, _cloud, log, args): if len(args) != 0: user = args[0] ids = [ ] if len(args) > 1: ids = args[1:] else: - user = util.get_cfg_option_str(cfg,"user","ubuntu") - ids = util.get_cfg_option_list_or_str(cfg,"ssh_import_id",[]) + user = util.get_cfg_option_str(cfg, "user", "ubuntu") + ids = util.get_cfg_option_list_or_str(cfg, "ssh_import_id", []) - if len(ids) == 0: return + if len(ids) == 0: + return cmd = [ "sudo", "-Hu", user, "ssh-import-id" ] + ids |