qvm-template: Tweak machine-readable output format.

QubesOS · Aug 25, 2020 · 2e06e30 · 2e06e30
1 parent 6efd85a
commit 2e06e30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/doc/manpages/qvm-template.rst b/doc/manpages/qvm-template.rst
@@ -219,7 +219,7 @@ Options
 
        ::
 
-           |{status}|{name}|{evr}|{reponame}|
+           {status}|{name}|{evr}|{reponame}
 
        Where ``{status}`` can be one of ``installed``, ``available``,
        ``extra``, or ``upgradable``.
@@ -307,7 +307,7 @@ Options
 
        ::
 
-           |{status}|{name}|{epoch}|{version}|{release}|{reponame}|{size}|{buildtime}|{installtime}|{license}|{url}|{summary}|{description}|
+           {status}|{name}|{epoch}|{version}|{release}|{reponame}|{size}|{buildtime}|{installtime}|{license}|{url}|{summary}|{description}
 
        Where ``{status}`` can be one of ``installed``, ``available``,
        ``extra``, or ``upgradable``.

diff --git a/qubesadmin/tools/qvm_template.py b/qubesadmin/tools/qvm_template.py
@@ -1082,9 +1082,8 @@ def append_vm(vm, status):
         elif operation == 'list':
             tpl_list = list_to_machine_output(tpl_list)
         for status, grp in tpl_list.items():
-            print('|' + status)
             for line in grp:
-                print('|'.join(line.values()) + '|')
+                print('|'.join([status] + list(line.values())))
     elif args.machine_readable_json:
         if operation == 'info':
             tpl_list = info_to_machine_output(tpl_list, replace_newline=False)