afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updates to check_cmd to just return output, as status is pointless

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-02 13:57:50 -08:00
parent 43554cbb62
commit a8ee7f35d6
12 changed files with 45 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/misc/utils.py
View file

@ -211,8 +211,8 @@ def check_cmd(args, **kwargs):
:param list[str]|str args: command arguments
:param dict kwargs: keyword arguments to pass to subprocess.Popen
:return: command status and stdout
:rtype: tuple[int, str]
:return: combined stdout and stderr
:rtype: str
:raises subprocess.CalledProcessError: when there is a non-zero exit status or the file to execute is not found
"""
kwargs["stdout"] = subprocess.PIPE
@ -224,7 +224,7 @@ def check_cmd(args, **kwargs):
status = p.wait()
if status != 0:
raise subprocess.CalledProcessError(status, args, stdout)
return status, stdout.strip()
return stdout.strip()
except OSError:
raise subprocess.CalledProcessError(-1, args)