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/format_disk.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/format_disk.py')
| -rwxr-xr-x | src/op_mode/format_disk.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/op_mode/format_disk.py b/src/op_mode/format_disk.py index 9d3797f17..df4486bce 100755 --- a/src/op_mode/format_disk.py +++ b/src/op_mode/format_disk.py @@ -22,7 +22,9 @@ from datetime import datetime from time import sleep from vyos.util import is_admin, ask_yes_no -from vyos.util import run, cmd, DEVNULL +from vyos.util import call +from vyos.util import cmd +from vyos.util import DEVNULL def list_disks(): disks = set() @@ -36,7 +38,7 @@ def list_disks(): def is_busy(disk: str): """Check if given disk device is busy by re-reading it's partition table""" - return run(f'sudo blockdev --rereadpt /dev/{disk}', stderr=DEVNULL) != 0 + return call(f'sudo blockdev --rereadpt /dev/{disk}', stderr=DEVNULL) != 0 def backup_partitions(disk: str): |