From 462bb3b8d3e9e88369e385ab770020e3ab20b041 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Fri, 6 Sep 2013 14:21:59 +0300 Subject: solver: if pinning is specified, it overrides preferred repos add also a test case for this --- src/solver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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)); } } -- cgit v1.2.3-70-g09d2