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

Merge pull request #2734 from coolo/fix_1009

Browse Source 
Installcheck: Ignore requires to packages with delete requests
This commit is contained in:
Stephan Kulow 2022-03-05 15:21:03 +01:00 committed by GitHub
commit b51fd11be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
staging-installcheck.py
View File

@ -70,17 +70,23 @@ class InstallChecker(object):
comments.append('Error: missing alternative provides for {}'.format(provide)) comments.append('Error: missing alternative provides for {}'.format(provide))
return False return False
def check_delete_request(self, req, to_ignore, comments): def check_delete_request(self, req, to_ignore, to_delete, comments):
package = req.get('package') package = req.get('package')
if package in to_ignore or self.ignore_deletes: if package in to_ignore or self.ignore_deletes:
self.logger.info('Delete request for package {} ignored'.format(package)) self.logger.info('Delete request for package {} ignored'.format(package))
return True return True
built_binaries = set([]) built_binaries = set()
file_infos = [] file_infos = []
for fileinfo in fileinfo_ext_all(self.api.apiurl, self.api.project, self.api.cmain_repo, 'x86_64', package): for fileinfo in fileinfo_ext_all(self.api.apiurl, self.api.project, self.api.cmain_repo, 'x86_64', package):
built_binaries.add(fileinfo.find('name').text) built_binaries.add(fileinfo.find('name').text)
file_infos.append(fileinfo) file_infos.append(fileinfo)
# extend the others - this asks for a refactoring, but we don't handle tons of delete requests often
for ptd in to_delete:
if package == ptd:
continue
for fileinfo in fileinfo_ext_all(self.api.apiurl, self.api.project, self.api.cmain_repo, 'x86_64', ptd):
built_binaries.add(fileinfo.find('name').text)
result = True result = True
for fileinfo in file_infos: for fileinfo in file_infos:
@ -90,10 +96,10 @@ class InstallChecker(object):
what_depends_on = depends_on(api.apiurl, api.project, api.cmain_repo, [package], True) what_depends_on = depends_on(api.apiurl, api.project, api.cmain_repo, [package], True)
# filter out dependency on package itself (happens with eg # filter out packages to be deleted
# java bootstrapping itself with previous build) for package in to_delete:
if package in what_depends_on: if package in what_depends_on:
what_depends_on.remove(package) what_depends_on.remove(package)
if len(what_depends_on): if len(what_depends_on):
comments.append('{} is still a build requirement of:\n\n- {}'.format( comments.append('{} is still a build requirement of:\n\n- {}'.format(
@ -165,9 +171,15 @@ class InstallChecker(object):
self.logger.error('no project status for {}'.format(project)) self.logger.error('no project status for {}'.format(project))
return False return False
# collect packages to be deleted
to_delete = set()
for req in status.findall('staged_requests/request'): for req in status.findall('staged_requests/request'):
if req.get('type') == 'delete': if req.get('type') == 'delete':
result = result and self.check_delete_request(req, to_ignore, result_comment) to_delete.add(req.get('package'))
for req in status.findall('staged_requests/request'):
if req.get('type') == 'delete':
result = result and self.check_delete_request(req, to_ignore, to_delete, result_comment)
for arch in architectures: for arch in architectures:
# hit the first repository in the target project (if existant) # hit the first repository in the target project (if existant)