diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-06 14:21:59 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-06 14:21:59 +0300 |
| commit | 462bb3b8d3e9e88369e385ab770020e3ab20b041 (patch) | |
| tree | 0b13c6b5bcd56a3f7e8ed762e0530edb2083dc98 /src | |
| parent | 0fe8507f9d9fbb2843f5bb6638abd448023a9be9 (diff) | |
| download | apk-tools-462bb3b8d3e9e88369e385ab770020e3ab20b041.tar.gz apk-tools-462bb3b8d3e9e88369e385ab770020e3ab20b041.tar.bz2 apk-tools-462bb3b8d3e9e88369e385ab770020e3ab20b041.tar.xz apk-tools-462bb3b8d3e9e88369e385ab770020e3ab20b041.zip | |
solver: if pinning is specified, it overrides preferred repos
add also a test case for this
Diffstat (limited to 'src')
| -rw-r--r-- | src/solver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/solver.c b/src/solver.c index 5383d0b..c62b7cc 100644 --- a/src/solver.c +++ b/src/solver.c @@ -256,7 +256,7 @@ static void inherit_pinning(struct apk_solver_state *ss, struct apk_package *pkg pkg->ss.pinning_allowed |= pinning; pkg->ss.tag_ok |= !!(repos & repo_mask); if (prefer) { - pkg->ss.pinning_preferred |= pinning; + pkg->ss.pinning_preferred = pinning; pkg->ss.tag_preferred = !!(repos & apk_db_get_pinning_mask_repos(ss->db, pkg->ss.pinning_preferred)); } } |