Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: raise CalledProcessError on failed service/command call

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-20 17:09:01 +02:00
parent 51a17ba749
commit 60443259d0
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/vm/qubesvm.py
View File

@ -1095,10 +1095,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
stdouterr = yield from p.communicate(input=input) stdouterr = yield from p.communicate(input=input)
if p.returncode: if p.returncode:
raise qubes.exc.QubesVMError(self, raise subprocess.CalledProcessError(p.returncode,
'service {!r} failed with retcode {!r}; ' args[0], *stdouterr)
'stdout={!r} stderr={!r}'.format(
args[0], p.returncode, *stdouterr))
return stdouterr return stdouterr
@ -1142,10 +1140,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
stdouterr = yield from p.communicate(input=input) stdouterr = yield from p.communicate(input=input)
if p.returncode: if p.returncode:
raise qubes.exc.QubesVMError(self, raise subprocess.CalledProcessError(p.returncode,
'service {!r} failed with retcode {!r}; ' args[0], *stdouterr)
'stdout={!r} stderr={!r}'.format(
args[0], p.returncode, *stdouterr))
return stdouterr return stdouterr