From da74d75e6bdaece371fd4702946559d4f4f59479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 12 Jul 2016 06:24:07 +0200 Subject: [PATCH] core: collect stderr too when vm.run_service is called with passio_popen Give access to all file descriptors when requested. --- core-modules/000QubesVm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py index d3b48676..dda909c9 100644 --- a/core-modules/000QubesVm.py +++ b/core-modules/000QubesVm.py @@ -1692,13 +1692,14 @@ class QubesVm(object): localcmd=localcmd, user=user, wait=wait, gui=gui) elif input: 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) return p.returncode else: return self.run("QUBESRPC %s %s" % (service, source), 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): self.log.debug('attach_network(netvm={!r})'.format(netvm))