diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
commit | cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b (patch) | |
tree | e9bdcbc699eda6db5e57d35b25d222bead96da12 /cloudinit/config/cc_power_state_change.py | |
parent | fbfd3789ede42ad50e0b79f202ab18b65537af52 (diff) | |
parent | e39abc783f7edd6435dbc7ea1fc3d02e6b3955d3 (diff) | |
download | vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.tar.gz vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.zip |
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_power_state_change.py')
-rw-r--r-- | cloudinit/config/cc_power_state_change.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_power_state_change.py b/cloudinit/config/cc_power_state_change.py index 638daef8..09d37371 100644 --- a/cloudinit/config/cc_power_state_change.py +++ b/cloudinit/config/cc_power_state_change.py @@ -119,7 +119,7 @@ def load_power_state(cfg): def doexit(sysexit): - os._exit(sysexit) # pylint: disable=W0212 + os._exit(sysexit) def execmd(exe_args, output=None, data_in=None): @@ -127,7 +127,7 @@ def execmd(exe_args, output=None, data_in=None): proc = subprocess.Popen(exe_args, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT) proc.communicate(data_in) - ret = proc.returncode # pylint: disable=E1101 + ret = proc.returncode except Exception: doexit(EXIT_FAIL) doexit(ret) |