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

pkglistgen: Actually remove overlapping packages

Browse Source
This commit is contained in:
Stephan Kulow 2017-12-15 09:03:46 +01:00
parent 0fecf508c0
commit 9fc8ffe21d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkglistgen.py
View File

@ -916,6 +916,14 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if overlap:
ignores = [ x.name for x in overlap.ignored ]
self.tool.solve_module(overlap.name, [], ignores)
overlapped = set(overlap.solved_packages['*'])
for arch in overlap.architectures:
overlapped |= set(overlap.solved_packages[arch])
for module in modules:
if module.name == 'overlap': continue
for arch in ['*'] + module.architectures:
for p in overlapped:
module.solved_packages[arch].pop(p, None)
self.tool._collect_unsorted_packages(modules)
self.tool._write_all_groups()