From e7cbce51db6f89a468410f7c0d21d09ce2204211 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 7 Apr 2017 09:20:19 -0400 Subject: [PATCH] Stop using .strip('-build') --- module_build_service/models.py | 7 +++++-- module_build_service/scheduler/handlers/repos.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module_build_service/models.py b/module_build_service/models.py index 23507eb5..282e58ef 100644 --- a/module_build_service/models.py +++ b/module_build_service/models.py @@ -223,7 +223,10 @@ class ModuleBuild(MBSBase): There should be at most one. """ - tag = event.repo_tag.strip('-build') + if event.repo_tag.endswith('-build'): + tag = event.repo_tag[:-6] + else: + tag = event.repo_tag query = session.query(cls)\ .filter(cls.koji_tag == tag)\ .filter(cls.state == BUILD_STATES["build"]) @@ -236,7 +239,7 @@ class ModuleBuild(MBSBase): @classmethod def from_tag_change_event(cls, session, event): - tag = event.tag.strip('-build') + tag = event.tag[:-6] if event.tag.endswith('-build') else event.tag query = session.query(cls)\ .filter(cls.koji_tag == tag)\ .filter(cls.state == BUILD_STATES["build"]) diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py index 70564eeb..5f99c966 100644 --- a/module_build_service/scheduler/handlers/repos.py +++ b/module_build_service/scheduler/handlers/repos.py @@ -41,7 +41,7 @@ def done(config, session, msg): if config.system == "koji" and not tag.endswith('-build'): log.debug("Tag %r does not end with '-build' suffix, ignoring" % tag) return - tag = tag.strip('-build') + tag = tag[:-6] if tag.endswith('-build') else tag module_build = models.ModuleBuild.from_repo_done_event(session, msg) if not module_build: log.debug("No module build found associated with koji tag %r" % tag)