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

Adding exception handling while doing import

Browse Source 
This fixes #1068

Signed-off-by: Valerij Maljulin <vmaljuli@redhat.com>
This commit is contained in:
Valerij Maljulin
2018-12-12 17:28:13 +01:00
parent ff1ed9926a
commit aed51dfae1
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module_build_service/builder/KojiContentGenerator.py
View File

@@ -871,16 +871,23 @@ class KojiContentGenerator(object):
metadata = self._get_content_generator_metadata(file_dir) metadata = self._get_content_generator_metadata(file_dir)
try: try:
serverdir = self._upload_outputs(session, metadata, file_dir) serverdir = self._upload_outputs(session, metadata, file_dir)
build_info = session.CGImport(metadata, serverdir) try:
build_info = session.CGImport(metadata, serverdir)
except koji.GenericError as e:
if "Build already exists" not in str(e):
raise
log.warning('Failed to import content generator')
build_info = None
if conf.koji_cg_tag_build: if conf.koji_cg_tag_build:
self._tag_cg_build() self._tag_cg_build()
log.info("Content generator import done.") if build_info is not None:
log.debug(json.dumps(build_info, sort_keys=True, indent=4)) log.info("Content generator import done.")
log.debug(json.dumps(build_info, sort_keys=True, indent=4))
# Only remove the logs if CG import was successful. If it fails, # Only remove the logs if CG import was successful. If it fails,
# then we want to keep them around for debugging. # then we want to keep them around for debugging.
log.info("Removing %r" % file_dir) log.info("Removing %r", file_dir)
shutil.rmtree(file_dir) shutil.rmtree(file_dir)
except Exception as e: except Exception as e:
log.exception("Content generator import failed: %s", e) log.exception("Content generator import failed: %s", e)
raise e raise e