From 57bf88aa30d36f318d2f9a2ffb868de9cd0e47ca Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Mon, 20 Nov 2017 00:44:07 -0500 Subject: [PATCH 1/2] Fix setting stderr default coloring policy stderr default should be set if stderr is None, not if stdout is None --- qubesadmin/tools/qvm_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubesadmin/tools/qvm_run.py b/qubesadmin/tools/qvm_run.py index 8de455c..6f724c0 100644 --- a/qubesadmin/tools/qvm_run.py +++ b/qubesadmin/tools/qvm_run.py @@ -130,7 +130,7 @@ def main(args=None, app=None): if args.color_output is None and args.filter_esc: args.color_output = '31' - if args.color_output is None and os.isatty(sys.stderr.fileno()): + if args.color_stderr is None and os.isatty(sys.stderr.fileno()): args.color_stderr = 31 if len(args.domains) > 1 and args.passio and not args.localcmd: From 6afe5a98c29719025771cb1aa7a9c0d75e2438cd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Mon, 20 Nov 2017 00:45:53 -0500 Subject: [PATCH 2/2] Restore correct colors in verbose mode Restore stderr color when printing to stderr, not stdout color --- qubesadmin/tools/qvm_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubesadmin/tools/qvm_run.py b/qubesadmin/tools/qvm_run.py index 6f724c0..1ee49c4 100644 --- a/qubesadmin/tools/qvm_run.py +++ b/qubesadmin/tools/qvm_run.py @@ -194,7 +194,7 @@ def main(args=None, app=None): if verbose > 0: if args.color_output: print('\033[0mRunning \'{}\' on {}\033[0;{}m'.format( - args.cmd, vm.name, args.color_output), + args.cmd, vm.name, args.color_stderr), file=sys.stderr) else: print('Running \'{}\' on {}'.format(args.cmd, vm.name),