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 /python/vyos | |
| 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 'python/vyos')
| -rw-r--r-- | python/vyos/util.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py index a7dc235eb..291ce64ea 100644 --- a/python/vyos/util.py +++ b/python/vyos/util.py @@ -92,6 +92,21 @@ def cmd(command, section='', shell=None, input=None, timeout=None, env=None, return decoded +def call(command, section='', shell=None, input=None, timeout=None, env=None, + universal_newlines=None, stdout=PIPE, stderr=STDOUT, decode=None): + """ does not raise exception on error, returns error code, print output """ + out, code = popen( + command, section, + stdout=stdout, stderr=stderr, + input=input, timeout=timeout, + env=env, shell=shell, + universal_newlines=universal_newlines, + decode=decode, + ) + print(out) + return code + + def read_file(path): """ Read a file to string """ with open(path, 'r') as f: |