diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-01-20 10:39:00 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-01-20 10:39:38 +0200 |
| commit | 0f895650996a2565c0dc59d3c94f861145b42c05 (patch) | |
| tree | d91b5d2f8174892161f8f448f1ec76dcc1f2be72 /test | |
| parent | 00fd7b07f12a18615da1ad32b915787f72074dfa (diff) | |
| download | apk-tools-0f895650996a2565c0dc59d3c94f861145b42c05.tar.gz apk-tools-0f895650996a2565c0dc59d3c94f861145b42c05.tar.bz2 apk-tools-0f895650996a2565c0dc59d3c94f861145b42c05.tar.xz apk-tools-0f895650996a2565c0dc59d3c94f861145b42c05.zip | |
solver: fix regression from "calculate branch minimum penalty early"
Forgot to reset per-name penalty when it got locked by apply_decision.
This also fine tunes compare_package_preference() to always prefer
packages specified on command line speeding up calculation certain
complicated solutions.
Diffstat (limited to 'test')
| -rw-r--r-- | test/error2.expect | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/error2.expect b/test/error2.expect index 65d0093..7faac5e 100644 --- a/test/error2.expect +++ b/test/error2.expect @@ -1,3 +1,2 @@ -2 unsatisfiable dependencies (solution with 4 names) +1 unsatisfiable dependencies (solution with 4 names) world: d<1.5 -b-1: d<2.0 |