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

Refactor code to split big method and improve doc

Browse Source
This commit is contained in:
Josef Reidinger 2021-07-29 10:37:44 +02:00
parent 12dc09c900
commit c838245a37
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
check_source.py
View File

@ -171,21 +171,9 @@ class CheckSource(ReviewBot.ReviewBot):
(self.required_maintainer, source_project) (self.required_maintainer, source_project)
) )
try: req = self.__ensure_add_role_request(source_project)
add_roles = get_request_list(self.apiurl, source_project, if req:
req_state=['new', 'review'], req_type='add_role') declined_msg += ' Created the add_role request %s for addressing this problem.' % req
add_roles = list(filter(self.select_add_role, add_roles))
if len(add_roles) > 0:
add_role_reqid = add_roles[0].reqid
else:
add_role_msg = 'Created automatically from request %s' % self.request.reqid
add_role_reqid = create_add_role_request(self.apiurl, source_project, self.required_maintainer,
'maintainer', message=add_role_msg)
declined_msg += ' Created the add_role request %s for addressing this problem.' % add_role_reqid
except HTTPError as e:
self.logger.error(
'Cannot create the corresponding add_role request for %s: %s' % (self.request.reqid, e)
)
self.review_messages['declined'] = declined_msg self.review_messages['declined'] = declined_msg
return False return False
@ -349,7 +337,7 @@ class CheckSource(ReviewBot.ReviewBot):
If a 'required-source-maintainer' is set, it checks whether it is a If a 'required-source-maintainer' is set, it checks whether it is a
maintainer for the source project. Inherited maintainership is maintainer for the source project. Inherited maintainership is
intentionally ignored to have explicit maitainer set. intentionally ignored to have explicit maintainer set.
source_project - source project name source_project - source project name
""" """
@ -364,7 +352,25 @@ class CheckSource(ReviewBot.ReviewBot):
return self.required_maintainer in maintainers return self.required_maintainer in maintainers
def select_add_role(self, request): def __ensure_add_role_request(self, source_project):
"""Returns add_role request ID for given source project. Creates that add role if needed."""
try:
add_roles = get_request_list(self.apiurl, source_project,
req_state=['new', 'review'], req_type='add_role')
add_roles = list(filter(self.__is_required_maintainer, add_roles))
if len(add_roles) > 0:
return add_roles[0].reqid
else:
add_role_msg = 'Created automatically from request %s' % self.request.reqid
return create_add_role_request(self.apiurl, source_project, self.required_maintainer,
'maintainer', message=add_role_msg)
except HTTPError as e:
self.logger.error(
'Cannot create the corresponding add_role request for %s: %s' % (self.request.reqid, e)
)
def __is_required_maintainer(self, request):
"""Returns true for add role requests that adds required maintainer user or group"""
action = request.actions[0] action = request.actions[0]
user = self.required_maintainer user = self.required_maintainer
if user.startswith('group:'): if user.startswith('group:'):