From 15e3241ba725a21604e0f3570e755a91b5edba00 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 17 Jan 2012 14:41:29 -0500 Subject: [PATCH] PEP8 coding style fixes. From: Juerg Haefliger This pulls in the named patch for LP: #914739 with a few other changes. --- cloudinit/CloudConfig/cc_bootcmd.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cloudinit/CloudConfig/cc_bootcmd.py') 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() -- cgit v1.2.3