diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-09 19:08:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 20:08:24 +0200 |
| commit | 9875a21bdb26df19f2faf3e81153dea15e4f9e3c (patch) | |
| tree | 8a1ecc1b318d80db156f397c34bc75f40c184728 /src/op_mode/powerctrl.py | |
| parent | c8a86d3ccee63b972c36346e6cb1c712c6801ad2 (diff) | |
| download | vyos-1x-9875a21bdb26df19f2faf3e81153dea15e4f9e3c.tar.gz vyos-1x-9875a21bdb26df19f2faf3e81153dea15e4f9e3c.zip | |
util: T2226: os.system was wrongly converted to run
os.system does print the ouput of the command, run() does not.
A new function called call() does the printing and return the error code.
Diffstat (limited to 'src/op_mode/powerctrl.py')
| -rwxr-xr-x | src/op_mode/powerctrl.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py index 772bb8198..0f3619411 100755 --- a/src/op_mode/powerctrl.py +++ b/src/op_mode/powerctrl.py @@ -21,7 +21,9 @@ import re from datetime import datetime, timedelta, time as type_time, date as type_date from vyos.util import ask_yes_no -from vyos.util import cmd, run +from vyos.util import cmd +from vyos.util import call +from vyos.util import run systemd_sched_file = "/run/systemd/shutdown/scheduled" @@ -132,7 +134,7 @@ def chk_vyatta_based_reboots(): if os.path.exists(f): jid = open(f).read().strip() if jid != 0: - run(f'sudo atrm {jid}') + call(f'sudo atrm {jid}') os.remove(f) def main(): |