From 4256a1d4f2489e844579bcb67f7a989070eed9f2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 1 Oct 2019 15:55:26 -0700 Subject: [PATCH] composer-cli: Fix upload log output --- src/composer/cli/upload.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/composer/cli/upload.py b/src/composer/cli/upload.py index 8b9e32d4..c59e225a 100644 --- a/src/composer/cli/upload.py +++ b/src/composer/cli/upload.py @@ -194,13 +194,14 @@ def upload_log(socket_path, api_version, args, show_json=False, testmode=0): return 1 api_route = client.api_url(api_version, "/upload/log/%s" % args[0]) - try: - result = client.get_url_raw(socket_path, api_route) - except RuntimeError as e: - print(str(e)) - return 1 + result = client.get_url_json(socket_path, api_route) + (rc, exit_now) = handle_api_result(result, show_json) + if exit_now: + return rc + + print("Upload log for %s:\n" % result["upload_id"]) + print(result["log"]) - print(result) return 0 def upload_cancel(socket_path, api_version, args, show_json=False, testmode=0):