diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-02-21 10:36:26 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-21 10:36:26 +0200 |
| commit | c18e15918518f6ce28e6a20badc1b490a4bac8d1 (patch) | |
| tree | 70dbf762a8c805dadd4c3aa295008ba2bf75e5c2 | |
| parent | 6f237d9149d3a27d1aae4d52dc8c73ed3e1508cc (diff) | |
| download | apk-tools-c18e15918518f6ce28e6a20badc1b490a4bac8d1.tar.gz apk-tools-c18e15918518f6ce28e6a20badc1b490a4bac8d1.tar.bz2 apk-tools-c18e15918518f6ce28e6a20badc1b490a4bac8d1.tar.xz apk-tools-c18e15918518f6ce28e6a20badc1b490a4bac8d1.zip | |
solver: remove unneeded flag
| -rw-r--r-- | src/solver.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/solver.c b/src/solver.c index 7c3679c..933c42f 100644 --- a/src/solver.c +++ b/src/solver.c @@ -74,7 +74,6 @@ struct apk_package_state { unsigned char preference; unsigned availability_checked : 1; unsigned unavailable : 1; - unsigned install_applied : 1; unsigned handle_install_if : 1; unsigned locked : 1; }; @@ -886,7 +885,6 @@ static solver_result_t apply_decision(struct apk_solver_state *ss, return SOLVERR_PRUNED; } - ps->install_applied = 1; ss->assigned_names++; ns->chosen = pkg; @@ -968,8 +966,7 @@ static void undo_decision(struct apk_solver_state *ss, ss->topology_position = pkg->topology_hard; } - if (ps->install_applied) { - ps->install_applied = 0; + if (ns->locked) { ss->assigned_names--; foreach_rinstall_if_pkg(ss, pkg, untrigger_install_if); foreach_dependency(ss, pkg->depends, undo_constraint); |