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

Improve _multibuild on accept

Browse Source
This commit is contained in:
Ludwig Nussel 2019-12-04 17:11:21 +01:00 committed by Stephan Kulow
parent 8b0a0324b4
commit 0eb12a53c4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osclib/accept_command.py
View File

@ -153,13 +153,17 @@ class AcceptCommand(object):
def fix_linking_packages(self, package, dry=False): def fix_linking_packages(self, package, dry=False):
project = self.api.project project = self.api.project
file_list = self.api.get_filelist_for_package(package, project) file_list = self.api.get_filelist_for_package(package, project)
# ignore # ignore linked packages
if '_multibuild' in file_list or '_link' in file_list: if '_link' in file_list:
return return
needed_links = set() needed_links = set()
for file in file_list: # if there's a multibuild we assume all flavors are built
if file.endswith('.spec') and file != f'{package}.spec': # using multibuild. So any potential previous links have to
needed_links.add(file[:-5]) # be removed ie set of needed_links left empty.
if '_multibuild' not in file_list:
for file in file_list:
if file.endswith('.spec') and file != f'{package}.spec':
needed_links.add(file[:-5])
local_links = set() local_links = set()
for link in self.api.linked_packages(package): for link in self.api.linked_packages(package):
if link['project'] == project: if link['project'] == project: