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

solver: do not backtrack over "exclude none" 

Otherwise we can return no solution at all instead of partially
satisfied solution (and give proper error message).
cute-signatures
Timo Teräs 2013-01-22 16:23:16 +02:00
parent 93bd305713
commit 528156a9fa
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/solver.c
View File

@ -971,8 +971,15 @@ static int next_branch(struct apk_solver_state *ss)
d->name->ss.backjump_enabled = 0;
backjump_name = NULL;
}
if (d->backup_until && backup_until > d->backup_until)
if (d->backup_until && d->backup_until < backup_until) {
backup_until = d->backup_until;
/* We can't backtrack over the immediate
* EXCLUDE decisions, as they are in a sense
* part of the bundle. */
while (backup_until < ss->num_decisions &&
!ss->decisions[backup_until+1].has_package)
backup_until++;
}
}
ss->num_decisions--;