diff --git a/qubesadmin/tools/qvm_ls.py b/qubesadmin/tools/qvm_ls.py index 573867e9..7e865c21 100644 --- a/qubesadmin/tools/qvm_ls.py +++ b/qubesadmin/tools/qvm_ls.py @@ -528,7 +528,8 @@ def __call__(self, parser, namespace, values, option_string=None): for column in sorted(Column.columns.values())) text += '\n\nAdditionally any VM property may be used as a column, ' \ 'see qvm-prefs --help-properties for available values' - parser.exit(message=text + '\n') + print(text + '\n') + sys.exit(0) class _HelpFormatsAction(argparse.Action): @@ -552,7 +553,9 @@ def __call__(self, parser, namespace, values, option_string=None): ' {fmt:{width}s} {columns}\n'.format( fmt=fmt, columns=','.join(formats[fmt]).upper(), width=width) for fmt in sorted(formats)) - parser.exit(message=text) + print(text) + sys.exit(0) + # common VM power states for easy command-line filtering