diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
commit | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (patch) | |
tree | 186d80c155d32f75d8efa3c6ec1ad3562f11ba0a /cloudinit/config/cc_power_state_change.py | |
parent | 26e6c265277cf5e29b8af311f2bb8759b0e811cd (diff) | |
parent | b76866ad72d433cc9008a137c464c7ed44401549 (diff) | |
download | vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.tar.gz vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.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) |