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

vm: fix run_service error reporting

Browse Source 
qubesadmin.exc.QubesVMError (in contrast to qubesa.exc.QubesVMError)
does not take VM instance as first argument.
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-17 01:32:27 +02:00
parent 88b559d985
commit f386d45695
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesadmin/vm/__init__.py
View File

@ -248,9 +248,9 @@ class QubesVM(qubesadmin.base.PropertyHolder):
stdouterr = p.communicate(input=input) stdouterr = p.communicate(input=input)
if p.returncode: if p.returncode:
raise qubesadmin.exc.QubesVMError(self, raise qubesadmin.exc.QubesVMError(
'service {!r} failed with retcode {!r}; ' 'VM {}: service {!r} failed with retcode {!r}; '
'stdout={!r} stderr={!r}'.format( 'stdout={!r} stderr={!r}'.format(self,
service, p.returncode, *stdouterr)) service, p.returncode, *stdouterr))
return stdouterr return stdouterr