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

qubes/vm: add passio_stderr argument to vm.run_service

Browse Source 
This allows getting error messages from service call, to provide more
meaningful error messages.
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-03 03:15:45 +02:00 committed by Wojtek Porczyk
parent 1cd6acd875
commit 7cbe2dbd38
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubes/vm/qubesvm.py
View File

@ -895,7 +895,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
def run_service(self, service, source=None, user=None, def run_service(self, service, source=None, user=None,
passio_popen=False, input=None, localcmd=None, gui=False, passio_popen=False, input=None, localcmd=None, gui=False,
wait=True): wait=True, passio_stderr=False):
'''Run service on this VM '''Run service on this VM
**passio_popen** and **input** are mutually exclusive. **passio_popen** and **input** are mutually exclusive.
@ -908,9 +908,12 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
''' # pylint: disable=redefined-builtin ''' # pylint: disable=redefined-builtin
if len([i for i in (input, passio_popen, localcmd) if i]) > 1: if len([i for i in (input, passio_popen, localcmd) if i]) > 1:
raise ValueError( raise TypeError(
'input, passio_popen and localcmd cannot be used together') 'input, passio_popen and localcmd cannot be used together')
if passio_stderr and not passio_popen:
raise TypeError('passio_stderr can be used only with passio_popen')
if input: if input:
localcmd = 'printf %s {}'.format(pipes.quote(input)) localcmd = 'printf %s {}'.format(pipes.quote(input))
@ -918,7 +921,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
return self.run('QUBESRPC {} {}'.format(service, source), return self.run('QUBESRPC {} {}'.format(service, source),
localcmd=localcmd, passio_popen=passio_popen, user=user, wait=wait, localcmd=localcmd, passio_popen=passio_popen, user=user, wait=wait,
gui=gui) gui=gui, passio_stderr=passio_stderr)
def request_memory(self, mem_required=None): def request_memory(self, mem_required=None):