atomic-desktops/ci-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comps-sync.py: Pass regexp exclude list to is_exclude_listed

Browse source
This commit is contained in:
Timothée Ravier 2023-09-27 10:26:19 +02:00
parent e00b1c88fe
commit dd8dd4c804
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
comps-sync.py
View file

@ -44,9 +44,9 @@ def write_manifest(fpath, pkgs, include=None):
f.write(f' - {pkg}\n') f.write(f' - {pkg}\n')
print(f'Wrote {fpath}') print(f'Wrote {fpath}')
def is_exclude_listed(pkgname): def is_exclude_listed(pkgname, exclude_list_regexp):
'''Check if pkgname is in the exclude list.''' '''Check if pkgname is in the exclude list.'''
for br in comps_exclude_list_all: for br in exclude_list_regexp:
if br.match(pkgname): if br.match(pkgname):
return True return True
return False return False
@ -120,7 +120,7 @@ for gid in ws_environ.group_ids:
ws_ostree_pkgs = set() ws_ostree_pkgs = set()
for pkg in comps.groups_match(id=ws_ostree_name)[0].packages: for pkg in comps.groups_match(id=ws_ostree_name)[0].packages:
if not is_exclude_listed(pkg.name): if not is_exclude_listed(pkg.name, comps_exclude_list_all):
ws_ostree_pkgs.add(pkg.name) ws_ostree_pkgs.add(pkg.name)
comps_unknown = set() comps_unknown = set()
@ -203,7 +203,7 @@ for desktop, groups in desktops_comps_groups.items():
for pkg in filtered.groups_match(id=group)[0].packages: for pkg in filtered.groups_match(id=group)[0].packages:
pkgname = pkg.name pkgname = pkg.name
exclude_list = comps_desktop_exclude_list.get(group, set()) exclude_list = comps_desktop_exclude_list.get(group, set())
if pkgname in exclude_list or is_exclude_listed(pkgname): if pkgname in exclude_list or is_exclude_listed(pkgname, comps_exclude_list_all):
continue continue
if pkgname in comps_group_pkgs: if pkgname in comps_group_pkgs:
comps_group_pkgs[pkgname].add(arch) comps_group_pkgs[pkgname].add(arch)