From bf28e8d50c4caa82a211283576c9aa165b1ea859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 12 May 2021 16:09:47 +0200 Subject: [PATCH] pkgset: Compare future events correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is possible to try to re-run a compose with old event. When trying to reuse pkgset data, we must use set the bounds not based on current/reused event, but actually check which was first. JIRA: CWFHEALTH-495 Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/pkgsets.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pungi/phases/pkgset/pkgsets.py b/pungi/phases/pkgset/pkgsets.py index 54dcafde..07f6e8c7 100644 --- a/pungi/phases/pkgset/pkgsets.py +++ b/pungi/phases/pkgset/pkgsets.py @@ -745,7 +745,8 @@ class KojiPackageSet(PackageSetBase): changed = self.koji_proxy.queryHistory( tables=["tag_listing", "tag_inheritance"], tag=tag, - afterEvent=old_koji_event, + afterEvent=min(koji_event, old_koji_event), + beforeEvent=max(koji_event, old_koji_event) + 1, ) if changed["tag_listing"]: self.log_debug("Builds under tag %s changed. Can't reuse." % tag) @@ -760,8 +761,8 @@ class KojiPackageSet(PackageSetBase): changed = self.koji_proxy.queryHistory( tables=["tag_listing", "tag_inheritance"], tag=t["name"], - afterEvent=old_koji_event, - beforeEvent=koji_event + 1, + afterEvent=min(koji_event, old_koji_event), + beforeEvent=max(koji_event, old_koji_event) + 1, ) if changed["tag_listing"]: self.log_debug(