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

mmd_resolver: store alternatives per source package

Browse Source 
Input:
* (c0) gtk: [1] + foo: [1]
* (c1) gtk: [1] + foo: [1, 2]

Before:
* c0 + gtk:1 + foo:1
* c1 + gtk:1 + foo:2

After:
* c0 + gtk:1 + foo:1
* c1 + gtk:1 + foo:1
* c1 + gtk:1 + foo:2

Acked-by: Jan Kaluža <jkaluza@redhat.com>
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
This commit is contained in:
Igor Gnatenko
2018-03-06 10:15:37 +01:00
committed by mprahl
parent e3490d129a
commit 52e73b64c2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module_build_service/mmd_resolver.py
View File

@@ -129,12 +129,13 @@ class MMDResolver(object):
for src in solvables:
job = self.pool.Job(solv.Job.SOLVER_INSTALL | solv.Job.SOLVER_SOLVABLE, src.id)
requires = src.lookup_deparray(solv.SOLVABLE_REQUIRES)
alts = alternatives[src] = {}
# XXX: can be optimized by favoring just by name, but requires additional handling
# of context due to name which would contain just N:S.
for opt in itertools.product(*[self.pool.whatprovides(dep) for dep in requires]):
log.debug("Testing combination: %s", opt)
log.debug("Testing %s with combination: %s", src, opt)
key = tuple(":".join(s.name.split(":", 2)[:2]) for s in opt)
if key in alternatives:
if key in alts:
log.debug("%s was already resolved, skipping", key)
continue
jobs = [self.pool.Job(solv.Job.SOLVER_FAVOR | solv.Job.SOLVER_SOLVABLE, s.id)
@@ -150,7 +151,7 @@ class MMDResolver(object):
log.debug("Transaction:")
for s in newsolvables:
log.debug(" - %s", s)
alternatives[key] = newsolvables
alts[key] = newsolvables
return set(frozenset("%s:%s" % (s.name, s.arch) for s in trans)
for trans in alternatives.values())
return set(frozenset("%s:%s" % (s.name, s.arch) for s in t)
for trans in alternatives.values() for t in trans.values())