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

cleanup_rings: first attempt to fix for multibuild

Browse Source
This commit is contained in:
Ludwig Nussel 2017-11-30 17:16:40 +01:00
parent 1769209240
commit 5cff039fd5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osclib/cleanup_rings.py
View File

@ -72,29 +72,37 @@ class CleanupRings(object):
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
for package in root.findall('package'): for package in root.findall('package'):
source = package.find('source').text # use main package name for multibuild. We can't just ignore
if package.attrib['name'].startswith('preinstall'): # multibuild as eg installation-images has no results for the main
# package itself
# https://github.com/openSUSE/open-build-service/issues/4198
name = package.attrib['name'].split(':')[0]
if name.startswith('preinstall'):
continue continue
self.sources.add(source)
source = package.find('source').text
if source != name:
print ("WARN {} != {}".format(source, name))
self.sources.add(name)
for subpkg in package.findall('subpkg'): for subpkg in package.findall('subpkg'):
subpkg = subpkg.text subpkg = subpkg.text
if subpkg in self.bin2src: if subpkg in self.bin2src:
if self.bin2src[subpkg] == source: if self.bin2src[subpkg] == name:
# different archs # different archs
continue continue
print('Binary {} is defined twice: {}/{}'.format(subpkg, prj, source)) print('Binary {} is defined twice: {}/{}'.format(subpkg, prj, name))
self.bin2src[subpkg] = source self.bin2src[subpkg] = name
for package in root.findall('package'): for package in root.findall('package'):
source = package.find('source').text name = package.attrib['name'].split(':')[0]
for pkg in package.findall('pkgdep'): for pkg in package.findall('pkgdep'):
if pkg.text not in self.bin2src: if pkg.text not in self.bin2src:
if not pkg.text.startswith('texlive-'): # XXX: texlive bullshit packaging if not pkg.text.startswith('texlive-'): # XXX: texlive bullshit packaging
print('Package {} not found in place'.format(pkg.text)) print('Package {} not found in place'.format(pkg.text))
continue continue
b = self.bin2src[pkg.text] b = self.bin2src[pkg.text]
self.pkgdeps[b] = source self.pkgdeps[b] = name
def repo_state_acceptable(self, project): def repo_state_acceptable(self, project):
url = makeurl(self.api.apiurl, ['build', project, '_result']) url = makeurl(self.api.apiurl, ['build', project, '_result'])