almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

pkgset: Compare future events correctly

Browse Source 
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ář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2021-05-12 16:09:47 +02:00
parent 7fe32ae758
commit bf28e8d50c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/phases/pkgset/pkgsets.py
View File

@ -745,7 +745,8 @@ class KojiPackageSet(PackageSetBase):
changed = self.koji_proxy.queryHistory( changed = self.koji_proxy.queryHistory(
tables=["tag_listing", "tag_inheritance"], tables=["tag_listing", "tag_inheritance"],
tag=tag, 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"]: if changed["tag_listing"]:
self.log_debug("Builds under tag %s changed. Can't reuse." % tag) self.log_debug("Builds under tag %s changed. Can't reuse." % tag)
@ -760,8 +761,8 @@ class KojiPackageSet(PackageSetBase):
changed = self.koji_proxy.queryHistory( changed = self.koji_proxy.queryHistory(
tables=["tag_listing", "tag_inheritance"], tables=["tag_listing", "tag_inheritance"],
tag=t["name"], tag=t["name"],
afterEvent=old_koji_event, afterEvent=min(koji_event, old_koji_event),
beforeEvent=koji_event + 1, beforeEvent=max(koji_event, old_koji_event) + 1,
) )
if changed["tag_listing"]: if changed["tag_listing"]:
self.log_debug( self.log_debug(