From 2cb057daf669a7128a88fa0e0a2e520d24635c82 Mon Sep 17 00:00:00 2001 From: Brendan Reilly Date: Thu, 12 Aug 2021 15:53:53 -0400 Subject: [PATCH] update --- module_build_service/builder/KojiContentGenerator.py | 6 +++--- module_build_service/builder/base.py | 2 +- module_build_service/common/scm.py | 2 +- module_build_service/scheduler/default_modules.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module_build_service/builder/KojiContentGenerator.py b/module_build_service/builder/KojiContentGenerator.py index 540de929..f7a8a275 100644 --- a/module_build_service/builder/KojiContentGenerator.py +++ b/module_build_service/builder/KojiContentGenerator.py @@ -362,7 +362,7 @@ class KojiContentGenerator(object): ret["filename"] = mmd_filename ret["filesize"] = len(raw_data) ret["checksum"] = hashlib.md5(raw_data).hexdigest() - except IOError as e: + except IOError: if arch == "src": # This might happen in case the Module is submitted directly # using the yaml without SCM URL. This should never happen @@ -371,7 +371,7 @@ class KojiContentGenerator(object): log.warning("No modulemd.src.txt found.") return else: - raise RuntimeError("Could not read %s: %s" % (mmd_path, e)) + raise components = [] if arch in ["noarch", "src"]: @@ -878,7 +878,7 @@ class KojiContentGenerator(object): build_info = session.CGImport(metadata, serverdir) except koji.GenericError as e: if "Build already exists" not in str(e): - raise RuntimeError("Build import failed: %s" % e) + raise log.warning("Failed to import content generator") build_info = None if conf.koji_cg_tag_build: diff --git a/module_build_service/builder/base.py b/module_build_service/builder/base.py index adc9ba5f..d122823b 100644 --- a/module_build_service/builder/base.py +++ b/module_build_service/builder/base.py @@ -330,7 +330,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): state=BUILD_STATES["failed"], state_reason=reason, failure_type="user") db_session.commit() - raise RuntimeError("Failed to gather buildroot groups from SCM.") + raise return groups @abstractmethod diff --git a/module_build_service/common/scm.py b/module_build_service/common/scm.py index 9ddd2372..c639702b 100644 --- a/module_build_service/common/scm.py +++ b/module_build_service/common/scm.py @@ -226,7 +226,7 @@ class SCM(object): "checkout: The requested commit hash was not found within the repository. " "Perhaps you forgot to push. The original message was: %s" % str(e) ) - raise RuntimeError("Unable to checkout module from SCM: %s" % e) + raise timestamp = SCM._run(["git", "show", "-s", "--format=%ct"], chdir=self.sourcedir)[1] self.version = provide_module_stream_version_from_timestamp(timestamp=timestamp) diff --git a/module_build_service/scheduler/default_modules.py b/module_build_service/scheduler/default_modules.py index 0086e5cc..81940063 100644 --- a/module_build_service/scheduler/default_modules.py +++ b/module_build_service/scheduler/default_modules.py @@ -182,10 +182,10 @@ def _get_default_modules(stream, default_modules_scm_url): scm_obj.checkout_ref(conf.rawhide_branch) else: # If it's not a rawhide build, then the branch should have existed - raise RuntimeError("Branch %s does not exist" % stream) + raise else: # If it's not a rawhide build, then the branch should have existed - raise RuntimeError("Branch %s does not exist" % stream) + raise idx = Modulemd.ModuleIndex.new() idx.update_from_defaults_directory(