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

Merge pull request #1266 from lnussel/master

Browse Source 
Skip maintainer review for certain Leap 15 submissions
This commit is contained in:
Ludwig Nussel 2017-11-21 10:52:17 +01:00 committed by GitHub
commit 4f605eb501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
leaper.py
View File

@ -149,6 +149,9 @@ class Leaper(ReviewBot.ReviewBot):
return False return False
if self.ibs and target_project.startswith('SUSE:SLE'): if self.ibs and target_project.startswith('SUSE:SLE'):
self.do_check_maintainer_review = False
if package in self.lookup_sle15: if package in self.lookup_sle15:
origin = self.lookup_sle15[package] origin = self.lookup_sle15[package]
@ -200,6 +203,10 @@ class Leaper(ReviewBot.ReviewBot):
if package in self.lookup_150: if package in self.lookup_150:
origin = self.lookup_150[package] origin = self.lookup_150[package]
# obviously
if src_project in ('openSUSE:Factory', 'openSUSE:Factory:NonFree'):
self.source_in_factory = True
is_fine_if_factory = False is_fine_if_factory = False
not_in_factory_okish = False not_in_factory_okish = False
if origin: if origin:
@ -327,6 +334,16 @@ class Leaper(ReviewBot.ReviewBot):
else: # no origin else: # no origin
# submission from SLE is ok # submission from SLE is ok
if src_project.startswith('SUSE:SLE-15'): if src_project.startswith('SUSE:SLE-15'):
self.do_check_maintainer_review = False
return True
# new package submitted from Factory. Check if it was in
# 42.3 before and skip maintainer review if so.
subprj = src_project[len('openSUSE:Factory'):]
if self.source_in_factory and target_project.startswith('openSUSE:Leap:15.0') \
and self.is_package_in_project('openSUSE:Leap:42.3'+subprj, package):
self.logger.info('package was in 42.3')
self.do_check_maintainer_review = False
return True return True
is_fine_if_factory = True is_fine_if_factory = True
@ -409,10 +426,11 @@ class Leaper(ReviewBot.ReviewBot):
self.needs_release_manager = False self.needs_release_manager = False
self.pending_factory_submission = False self.pending_factory_submission = False
self.source_in_factory = None self.source_in_factory = None
self.do_check_maintainer_review = True
self.packages = {} self.packages = {}
request_ok = ReviewBot.ReviewBot.check_one_request(self, req) request_ok = ReviewBot.ReviewBot.check_one_request(self, req)
if not self.ibs: if self.do_check_maintainer_review:
has_correct_maintainer = self.maintbot.check_one_request(req) has_correct_maintainer = self.maintbot.check_one_request(req)
self.logger.debug("has_correct_maintainer: %s", has_correct_maintainer) self.logger.debug("has_correct_maintainer: %s", has_correct_maintainer)