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

fix errors in channel policy

Browse source 
Fixes: https://pagure.io/koji/issue/4065
This commit is contained in:
Mike McLean 2024-03-28 12:24:38 -04:00 • committed by Tomas Kopecek
parent d0de585229
commit d0e90d3687
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
koji/policy.py
View file

@ -135,8 +135,12 @@ class MatchTest(BaseSimpleTest):
field = self.field field = self.field
if field not in data: if field not in data:
return False return False
value = data[field]
if value is None:
# None does not match any pattern
return False
for pattern in args: for pattern in args:
if fnmatch.fnmatch(data[field], pattern): if fnmatch.fnmatch(value, pattern):
return True return True
return False return False

3
kojihub/kojihub.py
View file

@ -10150,7 +10150,8 @@ def policy_data_from_task_args(method, arglist):
target = tinfo['name'] target = tinfo['name']
policy_data['target'] = target policy_data['target'] = target
t_opts = params.get('opts', {}) # we may have param['opts'] that is explicitly None
t_opts = params.get('opts') or {}
policy_data['scratch'] = t_opts.get('scratch', False) policy_data['scratch'] = t_opts.get('scratch', False)
return policy_data return policy_data