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

core: collect stderr too when vm.run_service is called with passio_popen

Browse Source 
Give access to all file descriptors when requested.
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-12 06:24:07 +02:00
parent 7e9c816b7b
commit da74d75e6b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core-modules/000QubesVm.py
View File

@ -1692,13 +1692,14 @@ class QubesVm(object):
localcmd=localcmd, user=user, wait=wait, gui=gui) localcmd=localcmd, user=user, wait=wait, gui=gui)
elif input: elif input:
p = self.run("QUBESRPC %s %s" % (service, source), p = self.run("QUBESRPC %s %s" % (service, source),
user=user, wait=wait, gui=gui, passio_popen=True) user=user, wait=wait, gui=gui, passio_popen=True,
passio_stderr=True)
p.communicate(input) p.communicate(input)
return p.returncode return p.returncode
else: else:
return self.run("QUBESRPC %s %s" % (service, source), return self.run("QUBESRPC %s %s" % (service, source),
passio_popen=passio_popen, user=user, wait=wait, passio_popen=passio_popen, user=user, wait=wait,
gui=gui) gui=gui, passio_stderr=passio_popen)
def attach_network(self, verbose = False, wait = True, netvm = None): def attach_network(self, verbose = False, wait = True, netvm = None):
self.log.debug('attach_network(netvm={!r})'.format(netvm)) self.log.debug('attach_network(netvm={!r})'.format(netvm))