| |
@@ -247,11 +247,14 @@
|
| |
except ValidationError: # pragma: no cover
|
| |
pass
|
| |
|
| |
- if 'branch' in issue_body and 'namespace' in issue_body \
|
| |
- and issue_body['namespace'] in ['modules', 'test-modules'] \
|
| |
- and not valid_module_stream_name(issue_body['branch']):
|
| |
- error_msg = ('Only characters, numbers, periods, dashes, underscores, '
|
| |
- 'and pluses are allowed in module branch names')
|
| |
+ if 'branch' in issue_body and 'namespace' in issue_body:
|
| |
+ branch = issue_body['branch']
|
| |
+ ns = issue_body['namespace']
|
| |
+ if ns in ['modules', 'test-modules', 'flatpaks'] \
|
| |
+ and not valid_module_stream_name(branch):
|
| |
+ error_msg = ('Only characters, numbers, periods, dashes, underscores, '
|
| |
+ 'and pluses are allowed in {} branch names'
|
| |
+ .format('flatpak' if ns == 'flatpaks' else 'module'))
|
| |
prompt_to_close_bad_ticket(issue_body, error_msg)
|
| |
return
|
| |
|
| |
@@ -313,7 +316,7 @@
|
| |
prompt_to_close_bad_ticket(issue_json, error)
|
| |
return
|
| |
|
| |
- if force or exception is True or namespace == 'modules':
|
| |
+ if force or exception is True or namespace in ('modules', 'flatpaks'):
|
| |
skip_msg = '- Skipping verification of RHBZ'
|
| |
if bug_id:
|
| |
skip_msg = '{0} #{1}'.format(skip_msg, bug_id)
|
| |
mohanboddu
commented 4 years ago
This is same #6 but just rebased as @otaylor is on PTO.
Signed-off-by: Mohan Boddu mboddu@bhujji.com