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

initial effort to remove swallowing exceptions within internal code

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-02 13:39:44 -08:00
parent a3356127d2
commit 43554cbb62
10 changed files with 423 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,7 @@ def cmd_output(args):
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout, _ = p.communicate()
status = p.wait()
return status, stdout
return status, stdout.strip()
except OSError:
raise subprocess.CalledProcessError(-1, args)
@ -222,9 +222,9 @@ def check_cmd(args, **kwargs):
p = subprocess.Popen(args, **kwargs)
stdout, _ = p.communicate()
status = p.wait()
if status:
if status != 0:
raise subprocess.CalledProcessError(status, args, stdout)
return status, stdout
return status, stdout.strip()
except OSError:
raise subprocess.CalledProcessError(-1, args)