Revert "cppcheckdata.py: better handling when subprocess call fails"
This reverts commit 1cc3b46d32
.
This commit is contained in:
parent
1cc3b46d32
commit
9e31d6d05d
|
@ -1391,11 +1391,7 @@ def get_path_premium_addon():
|
||||||
|
|
||||||
|
|
||||||
def cmd_output(cmd):
|
def cmd_output(cmd):
|
||||||
if sys.platform == 'win32':
|
try:
|
||||||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
return subprocess.check_output(cmd).strip().decode('ascii')
|
||||||
else:
|
except subprocess.CalledProcessError as e:
|
||||||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=os.setsid)
|
return e.output
|
||||||
comm = p.communicate()
|
|
||||||
if p.returncode == 0:
|
|
||||||
return comm[0].decode(encoding='utf-8', errors='ignore')
|
|
||||||
return comm[1].decode(encoding='utf-8', errors='ignore')
|
|
||||||
|
|
Loading…
Reference in New Issue