From cca6a7e33265fd933c57d3e2b04f1a522c25c3e0 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 15 Sep 2011 09:48:51 +0300 Subject: solver: fix sorting when solver is used multiple times within run namely this fixes apk upgrade without --no-self-upgrade when the solver is called twice. --- src/solver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/solver.c b/src/solver.c index b8dcc62..53fded2 100644 --- a/src/solver.c +++ b/src/solver.c @@ -158,9 +158,10 @@ static void sort_hard_dependencies(struct apk_solver_state *ss, struct apk_packa pkg->state_ptr = calloc(1, sizeof(struct apk_package_state)); ps = pkg_to_ps(pkg); - if (pkg->topology_hard) + if (ps->topology_soft) return; pkg->topology_hard = -1; + ps->topology_soft = -1; /* Consider hard dependencies only */ foreach_dependency_pkg(ss, pkg->depends, sort_hard_dependencies); -- cgit v1.2.3-60-g2f50