diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
| commit | 15e3241ba725a21604e0f3570e755a91b5edba00 (patch) | |
| tree | d84be61c3a56ddc03eb927d5de5433afacadf64b /cloudinit/CloudConfig/cc_bootcmd.py | |
| parent | 2f7227c7092ad873757167f62c2a82fb4ee69472 (diff) | |
| download | vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.tar.gz vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.zip | |
[PATCH] PEP8 coding style fixes.
From: Juerg Haefliger <juerg.haefliger@hp.com>
This pulls in the named patch for LP: #914739 with a few other changes.
Diffstat (limited to 'cloudinit/CloudConfig/cc_bootcmd.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_bootcmd.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_bootcmd.py b/cloudinit/CloudConfig/cc_bootcmd.py index 98a7a747..66c452e9 100644 --- a/cloudinit/CloudConfig/cc_bootcmd.py +++ b/cloudinit/CloudConfig/cc_bootcmd.py @@ -18,11 +18,13 @@ import cloudinit.util as util import subprocess import tempfile +import os from cloudinit.CloudConfig import per_always frequency = per_always + def handle(_name, cfg, cloud, log, _args): - if not cfg.has_key("bootcmd"): + if "bootcmd" not in cfg: return try: @@ -33,7 +35,7 @@ def handle(_name, cfg, cloud, log, _args): except: log.warn("failed to shellify bootcmd") raise - + try: env = os.environ.copy() env['INSTANCE_ID'] = cloud.get_instance_id() |