Skip to content

Commit

Permalink
recursive-conservative needs to do one solve.transaction()
Browse files Browse the repository at this point in the history
Doing one-per-solvable might be more robust, but leads to undesireable
and/or inconsistent behavior depending on the ordering of the
solvable-list. Reverting that specific piece of 39e310a

closes #6151
https://pulp.plan.io/issues/6151

(cherry picked from commit 792554f)
  • Loading branch information
ggainey authored and evgeni committed Feb 24, 2020
1 parent ba20df3 commit abddb2b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions plugins/pulp_rpm/plugins/importers/yum/pulp_solv.py
Expand Up @@ -955,10 +955,10 @@ def run_solver_jobs(jobs):
return set(transaction.newsolvables())

solvables_to_copy = set(solvables)
install_jobs = []
while solvables_to_copy:
# Take one solvable
solvable = solvables_to_copy.pop()
install_jobs = []

if solvable.name.startswith("module:"):
# If the solvable being installed is a module, try to install it and all of its
Expand All @@ -981,9 +981,9 @@ def run_solver_jobs(jobs):
unit_install_job = self._pool.Job(flags, solvable.id)
install_jobs.append(unit_install_job)

# Depsolv using the list of unit install jobs, add them to the results
solvables_copied = run_solver_jobs(install_jobs)
result_solvables.update(solvables_copied)
# Depsolv using the list of unit install jobs, add them to the results
solvables_copied = run_solver_jobs(install_jobs)
result_solvables.update(solvables_copied)

return result_solvables

Expand Down

0 comments on commit abddb2b

Please sign in to comment.