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

qvm-template: Replace newlines in machine-readable output.

Browse Source
This commit is contained in:
WillyPillow 2020-08-07 02:14:37 +08:00
parent ed35802ca2
commit ba7b113206
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesadmin/tools/qvm_template.py
View File

@ -898,7 +898,7 @@ def list_templates(args: argparse.Namespace,
outputs.append((status, output)) outputs.append((status, output))
return outputs return outputs
def info_to_machine_output(tpls): def info_to_machine_output(tpls, replace_newline=True):
outputs = [] outputs = []
for status, grp in itertools.groupby(tpls, lambda x: x[0]): for status, grp in itertools.groupby(tpls, lambda x: x[0]):
output = [] output = []
@ -908,7 +908,8 @@ def list_templates(args: argparse.Namespace,
dlsize = str(dlsize) dlsize = str(dlsize)
buildtime = str(buildtime) buildtime = str(buildtime)
install_time = str(install_time) if install_time else '' install_time = str(install_time) if install_time else ''
# TODO: Escape newlines in description? if replace_newline:
description = description.replace('\n', '|')
output.append((name, epoch, version, release, reponame, output.append((name, epoch, version, release, reponame,
dlsize, buildtime, install_time, licence, url, summary, dlsize, buildtime, install_time, licence, url, summary,
description)) description))