yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1402 from lnussel/requestfinder

Browse Source 
requestfinder: fix exclude settings
This commit is contained in:
Ludwig Nussel 2018-02-23 10:00:30 +01:00 committed by GitHub
commit 6e0778a3e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
requestfinder.py
View File

@ -123,6 +123,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
'query': None, 'query': None,
'exclude-project': None, 'exclude-project': None,
'exclude-user': None, 'exclude-user': None,
'exclude-group': None,
} }
if opts.settings: if opts.settings:
@ -154,7 +155,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if review.by_project: if review.by_project:
skip = False skip = False
if settings['exclude-project']: if settings['exclude-project']:
for p in settings['exclude-project']: for p in settings['exclude-project'].split(' '):
if review.by_project.startswith(p): if review.by_project.startswith(p):
skip = True skip = True
break break
@ -164,11 +165,20 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
else: else:
print("osc review %s -m '%s' -P %s %s" % (settings['action'], settings['message'], review.by_project, r.reqid)) print("osc review %s -m '%s' -P %s %s" % (settings['action'], settings['message'], review.by_project, r.reqid))
elif review.by_group: elif review.by_group:
print("osc review %s -m '%s' -G %s %s" % (settings['action'], settings['message'], review.by_group, r.reqid)) skip = False
if settings['exclude-group']:
groups = settings['exclude-group'].split(' ')
for g in groups:
if review.by_group == g:
skip = True
break
if not skip:
print("osc review %s -m '%s' -G %s %s" % (settings['action'], settings['message'], review.by_group, r.reqid))
elif review.by_user: elif review.by_user:
skip = False skip = False
if settings['exclude-user']: if settings['exclude-user']:
for u in settings['exclude-user']: users = settings['exclude-user'].split(' ')
for u in users:
if review.by_user == u: if review.by_user == u:
skip = True skip = True
break break