From 53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 16 Feb 2012 11:45:54 +0200 Subject: solver: fix allowed pinning calculation --- src/solver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/solver.c b/src/solver.c index d7a8f63..a12de28 100644 --- a/src/solver.c +++ b/src/solver.c @@ -414,7 +414,7 @@ static int get_preference(struct apk_solver_state *ss, preferred_pinning = ns->preferred_pinning ?: APK_DEFAULT_PINNING_MASK; preferred_repos = get_pinning_mask_repos(ss->db, preferred_pinning); - allowed_pinning = ns->allowed_pinning | ns->preferred_pinning | APK_DEFAULT_PINNING_MASK; + allowed_pinning = ns->allowed_pinning | preferred_pinning; if (preferred_pinning != allowed_pinning) allowed_repos = get_pinning_mask_repos(ss->db, allowed_pinning); else @@ -474,7 +474,7 @@ static int update_name_state(struct apk_solver_state *ss, struct apk_name *name) preferred_pinning = ns->preferred_pinning ?: APK_DEFAULT_PINNING_MASK; preferred_repos = get_pinning_mask_repos(ss->db, preferred_pinning); - allowed_pinning = ns->allowed_pinning | ns->preferred_pinning | APK_DEFAULT_PINNING_MASK; + allowed_pinning = ns->allowed_pinning | preferred_pinning; if (preferred_pinning != allowed_pinning) allowed_repos = get_pinning_mask_repos(ss->db, allowed_pinning); else -- cgit v1.2.3-70-g09d2