Merge remote-tracking branch 'qubesos/pr/40'
* qubesos/pr/40: Disable spinner if --raw-data Fix qvm-ls --raw-data
This commit is contained in:
commit
bd9016a2db
@ -571,14 +571,14 @@ def main(args=None, app=None):
|
||||
if col.upper() not in Column.columns:
|
||||
PropertyColumn(col.lower())
|
||||
|
||||
if args.spinner:
|
||||
if args.spinner and not args.raw_data:
|
||||
# we need Enterprise Edition™, since it's the only one that detects TTY
|
||||
# and uses dots if we are redirected somewhere else
|
||||
spinner = qubesadmin.spinner.QubesSpinnerEnterpriseEdition(sys.stderr)
|
||||
else:
|
||||
spinner = qubesadmin.spinner.DummySpinner(sys.stderr)
|
||||
|
||||
table = Table(args.app, columns, spinner)
|
||||
table = Table(args.app, columns, spinner, args.raw_data)
|
||||
table.write_table(sys.stdout)
|
||||
|
||||
return 0
|
||||
|
Loading…
Reference in New Issue
Block a user