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

Fix formatting glitches after conversion to await

Browse Source 
QubesOS/qubes-issues#2738
This commit is contained in:
Rusty Bird 2021-02-11 11:17:40 +00:00
parent d3d6b9de2b
commit 7a91af9b2c
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/vm/adminvm.py
View File

@ -280,9 +280,7 @@ class AdminVM(qubes.vm.BaseVM):
'name', 'name',
self.name, self.name,
]) ])
return (await asyncio.create_subprocess_exec( return await asyncio.create_subprocess_exec(*cmd, **kwargs)
*cmd,
**kwargs))
async def run_service_for_stdio(self, *args, input=None, **kwargs): async def run_service_for_stdio(self, *args, input=None, **kwargs):
'''Run a service, pass an optional input and return (stdout, stderr). '''Run a service, pass an optional input and return (stdout, stderr).

6
qubes/vm/qubesvm.py
View File

@ -1462,14 +1462,14 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
self, 'Domain {!r}: qrexec not connected'.format(self.name)) self, 'Domain {!r}: qrexec not connected'.format(self.name))
await self.fire_event_async('domain-cmd-pre-run', pre_event=True, await self.fire_event_async('domain-cmd-pre-run', pre_event=True,
start_guid=gui) start_guid=gui)
return (await asyncio.create_subprocess_exec( return await asyncio.create_subprocess_exec(
qubes.config.system_path['qrexec_client_path'], qubes.config.system_path['qrexec_client_path'],
'-d', str(self.name), '-d', str(self.name),
*(('-t', '-T') if filter_esc else ()), *(('-t', '-T') if filter_esc else ()),
'{}:QUBESRPC {} {}'.format(user, service, source), '{}:QUBESRPC {} {}'.format(user, service, source),
**kwargs)) **kwargs)
async def run_service_for_stdio(self, *args, input=None, **kwargs): async def run_service_for_stdio(self, *args, input=None, **kwargs):
"""Run a service, pass an optional input and return (stdout, stderr). """Run a service, pass an optional input and return (stdout, stderr).