modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-04 19:28:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #618: mbs-build prints json instead of message

Browse Source
This commit is contained in:
Filip Valder
2017-08-07 13:58:33 +02:00
parent ddc57d08eb
commit d93f98caba
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/mbs-build
View File

@@ -249,7 +249,7 @@ def submit_module_build(scm_url, branch, server, id_provider, pyrpkg, verify=Tru
scm_url = get_scm_url(scm_url, pyrpkg)
branch = get_scm_branch(branch)
if not scm_url or not branch:
return -2
return -2, None
logging.info("Submitting module build %s", scm_url)
@@ -261,9 +261,11 @@ def submit_module_build(scm_url, branch, server, id_provider, pyrpkg, verify=Tru
logging.info(resp.text)
data = resp.json()
if 'id' in data:
return data['id']
return -3
if 'error' in data:
return -4, "%s %s: %s" % (data['status'], data['error'], data['message'])
elif 'id' in data:
return data['id'], None
return -3, None
def do_local_build(scm_url, branch, skiptests, log_flag=None):
"""
@@ -464,9 +466,11 @@ def main():
if args.cmd_name == "submit":
# Submit the module build.
build_id = submit_module_build(args.scm_url, args.branch, args.server,
args.idprovider, args.pyrpkg_client, args.verify, args.optional)
build_id, errmsg = submit_module_build(args.scm_url, args.branch, args.server,
args.idprovider, args.pyrpkg_client, args.verify, args.optional)
if build_id < 0:
if errmsg:
logging.critical(errmsg)
sys.exit(build_id)
if args.watch: