summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_bootcmd.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-05-12 10:56:26 -0700
commitf11827aee59cf2678c3d2a157218a3fe2831f5c2 (patch)
tree94c8f39d66d003b7d0d211dd521b64b5041287b3 /cloudinit/config/cc_bootcmd.py
parent690bdce9a73ec6d00b4eebbbca31cc527e7b2fce (diff)
downloadvyos-cloud-init-f11827aee59cf2678c3d2a157218a3fe2831f5c2.tar.gz
vyos-cloud-init-f11827aee59cf2678c3d2a157218a3fe2831f5c2.zip
Fix up a ton of flake8 issues
Diffstat (limited to 'cloudinit/config/cc_bootcmd.py')
-rw-r--r--cloudinit/config/cc_bootcmd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_bootcmd.py b/cloudinit/config/cc_bootcmd.py
index a295cc4e..b763a3c3 100644
--- a/cloudinit/config/cc_bootcmd.py
+++ b/cloudinit/config/cc_bootcmd.py
@@ -38,7 +38,7 @@ def handle(name, cfg, cloud, log, _args):
content = util.shellify(cfg["bootcmd"])
tmpf.write(util.encode_text(content))
tmpf.flush()
- except:
+ except Exception:
util.logexc(log, "Failed to shellify bootcmd")
raise
@@ -49,6 +49,6 @@ def handle(name, cfg, cloud, log, _args):
env['INSTANCE_ID'] = str(iid)
cmd = ['/bin/sh', tmpf.name]
util.subp(cmd, env=env, capture=False)
- except:
+ except Exception:
util.logexc(log, "Failed to run bootcmd module %s", name)
raise