updated per maintainer review

This commit is contained in:
Hao Luo 2021-12-30 17:32:15 -06:00 committed by Muayyad Alsadi
parent df400518a7
commit 31df70b8d2

View File

@ -1292,7 +1292,8 @@ def compose_version(compose, args):
print(__version__) print(__version__)
return return
if getattr(args, 'format', 'pretty') == 'json': if getattr(args, 'format', 'pretty') == 'json':
print('{ "version": "{version}" }'.replace('{version}', __version__)) res = {"version": __version__}
print(json.dumps(res))
return return
log("podman-composer version", __version__) log("podman-composer version", __version__)
compose.podman.run(["--version"], "", [], sleep=0) compose.podman.run(["--version"], "", [], sleep=0)
@ -1659,9 +1660,6 @@ def compose_logs(compose, args):
@cmd_run(podman_compose, 'config', "displays the compose file") @cmd_run(podman_compose, 'config', "displays the compose file")
def compose_config(compose, args): def compose_config(compose, args):
file_path = getattr(args, 'file', [])[0] file_path = getattr(args, 'file', [])[0]
if (file_path == None):
sys.stderr("File path is required. use -f flag to set the input file")
return
f = open(file_path, "r") f = open(file_path, "r")
print(f.read()) print(f.read())
@ -1671,8 +1669,8 @@ def compose_config(compose, args):
@cmd_parse(podman_compose, 'version') @cmd_parse(podman_compose, 'version')
def compose_version_parse(parser): def compose_version_parse(parser):
parser.add_argument("-f", "--format", type=str, default='pretty', parser.add_argument("-f", "--format", choices=['pretty', 'json'], default='pretty',
help="Format the output. Values: [pretty | json].") help="Format the output")
parser.add_argument("--short", action='store_true', parser.add_argument("--short", action='store_true',
help="Shows only Podman Compose's version number") help="Shows only Podman Compose's version number")