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

tools/qvm-run: add error message if command in VM failed

Browse Source 
Print some error even without --pass-io, otherwise the only way to learn
the failure is checking $?, as no other visual sign is there.

Fixes QubesOS/qubes-issues#4533
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-07 04:54:47 +01:00
parent 4b00ef7ec7
commit 954ffc4bf2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubesadmin/tools/qvm_run.py
View File

@ -245,14 +245,14 @@ def main(args=None, app=None):
stdin=proc.stdout) stdin=proc.stdout)
# stdin is closed below # stdin is closed below
proc.stdout.close() proc.stdout.close()
procs.append(local_proc) procs.append((vm, local_proc))
elif args.passio: elif args.passio:
copy_proc = multiprocessing.Process(target=copy_stdin, copy_proc = multiprocessing.Process(target=copy_stdin,
args=(proc.stdin,)) args=(proc.stdin,))
copy_proc.start() copy_proc.start()
# keep the copying process running # keep the copying process running
proc.stdin.close() proc.stdin.close()
procs.append(proc) procs.append((vm, proc))
except qubesadmin.exc.QubesException as e: except qubesadmin.exc.QubesException as e:
if args.color_output: if args.color_output:
sys.stdout.write('\033[0m') sys.stdout.write('\033[0m')
@ -260,13 +260,19 @@ def main(args=None, app=None):
vm.log.error(str(e)) vm.log.error(str(e))
return -1 return -1
try: try:
for proc in procs: for vm, proc in procs:
this_retcode = proc.wait()
if this_retcode and args.verbose > 0:
print_no_color(
'{}: command failed with code: {}'.format(
vm.name, this_retcode),
file=sys.stderr, color=args.color_stderr)
retcode = max(retcode, proc.wait()) retcode = max(retcode, proc.wait())
except KeyboardInterrupt: except KeyboardInterrupt:
for proc in procs: for vm, proc in procs:
with contextlib.suppress(ProcessLookupError): with contextlib.suppress(ProcessLookupError):
proc.send_signal(signal.SIGINT) proc.send_signal(signal.SIGINT)
for proc in procs: for vm, proc in procs:
retcode = max(retcode, proc.wait()) retcode = max(retcode, proc.wait())
finally: finally:
if dispvm: if dispvm: