modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-08 21:29:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmd_resolver: simplify conflict rule

Browse Source 
Conflicting with module(foo) is more than enough to make sure that we
will have only one copy of solvables providing it.

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
This commit is contained in:
Igor Gnatenko
2018-02-28 19:49:27 +01:00
committed by mprahl
parent 9ce5dffb14
commit 652c445b2c
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_build_service/mmd_resolver.py
View File

@@ -115,7 +115,6 @@ class MMDResolver(object):
self.build_repo = self.pool.add_repo("build")
self.available_repo = self.pool.add_repo("available")
self.solvables_per_name = {}
self.alternatives_whitelist = set()
def _create_solvable(self, repo, mmd):
@@ -172,16 +171,7 @@ class MMDResolver(object):
self.alternatives_whitelist.add(name)
# Conflicts
if mmd.get_name() not in self.solvables_per_name:
self.solvables_per_name[mmd.get_name()] = []
for other_solvable in self.solvables_per_name[mmd.get_name()]:
other_solvable.add_conflicts(
self.pool.Dep("module(%s)" % solvable.name).Rel(
solv.REL_EQ, self.pool.Dep(solvable.evr)))
solvable.add_conflicts(
self.pool.Dep("module(%s)" % other_solvable.name).Rel(
solv.REL_EQ, self.pool.Dep(other_solvable.evr)))
self.solvables_per_name[mmd.get_name()].append(solvable)
solvable.add_conflicts(self.pool.Dep("module(%s)" % mmd.get_name()))
return solvable