jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solver: remove unneeded flag

cute-signatures
Timo Teräs 2012-02-21 10:36:26 +02:00
parent 6f237d9149
commit c18e159185
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/solver.c
View File

@ -74,7 +74,6 @@ struct apk_package_state {
unsigned char preference; unsigned char preference;
unsigned availability_checked : 1; unsigned availability_checked : 1;
unsigned unavailable : 1; unsigned unavailable : 1;
unsigned install_applied : 1;
unsigned handle_install_if : 1; unsigned handle_install_if : 1;
unsigned locked : 1; unsigned locked : 1;
}; };
@ -886,7 +885,6 @@ static solver_result_t apply_decision(struct apk_solver_state *ss,
return SOLVERR_PRUNED; return SOLVERR_PRUNED;
} }
ps->install_applied = 1;
ss->assigned_names++; ss->assigned_names++;
ns->chosen = pkg; ns->chosen = pkg;
@ -968,8 +966,7 @@ static void undo_decision(struct apk_solver_state *ss,
ss->topology_position = pkg->topology_hard; ss->topology_position = pkg->topology_hard;
} }
if (ps->install_applied) { if (ns->locked) {
ps->install_applied = 0;
ss->assigned_names--; ss->assigned_names--;
foreach_rinstall_if_pkg(ss, pkg, untrigger_install_if); foreach_rinstall_if_pkg(ss, pkg, untrigger_install_if);
foreach_dependency(ss, pkg->depends, undo_constraint); foreach_dependency(ss, pkg->depends, undo_constraint);