particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kojira: don't expire ignored tags with targets

Browse source 
Fixes: https://pagure.io/koji/issue/2542
This commit is contained in:
Tomas Kopecek 2020-10-22 12:45:14 +02:00
parent a09cacc853
commit 412a29bb88
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
util/kojira
View file

@ -780,10 +780,14 @@ class RepoManager(object):
n_need = len(self.needed_tags)
ignore = self.options.ignore_tags.split()
self.build_tags = set([
t['build_tag'] for t in self.session.getBuildTargets()
if not koji.util.multi_fnmatch(t['build_tag_name'], ignore)
])
self.build_tags = set()
self.ignored_build_tags = set()
for t in self.session.getBuildTargets():
if koji.util.multi_fnmatch(t['build_tag_name'], ignore):
self.ignored_build_tags.add(t['build_tag'])
else:
self.build_tags.add(t['build_tag'])
# index repos by tag
tag_repos = {}
for repo in to_list(self.repos.values()):
@ -846,7 +850,7 @@ class RepoManager(object):
entry['taginfo'])
del self.needed_tags[tag_id]
for tag_id, repolist in tag_repos.items():
if tag_id not in self.build_tags:
if tag_id not in self.build_tags and not in self.ignored_build_tags:
# repos for these tags are no longer required
for repo in repolist:
if repo.ready():