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

Merge remote-tracking branch 'qubesos/pr/38'

Browse Source 
* qubesos/pr/38:
  Restore correct colors in verbose mode
  Fix setting stderr default coloring policy
This commit is contained in:
Marek Marczykowski-Górecki 2017-11-20 13:04:42 +01:00
commit afe4eef15f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesadmin/tools/qvm_run.py
View File

@ -130,7 +130,7 @@ def main(args=None, app=None):
if args.color_output is None and args.filter_esc: if args.color_output is None and args.filter_esc:
args.color_output = '31' 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 args.color_stderr = 31
if len(args.domains) > 1 and args.passio and not args.localcmd: if len(args.domains) > 1 and args.passio and not args.localcmd:
@ -194,7 +194,7 @@ def main(args=None, app=None):
if verbose > 0: if verbose > 0:
if args.color_output: if args.color_output:
print('\033[0mRunning \'{}\' on {}\033[0;{}m'.format( 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) file=sys.stderr)
else: else:
print('Running \'{}\' on {}'.format(args.cmd, vm.name), print('Running \'{}\' on {}'.format(args.cmd, vm.name),