solver: fix allowed pinning calculation

cute-signatures
Timo Teräs 2012-02-16 11:45:54 +02:00
parent 0800d7e050
commit 53f8a36c1f
1 changed files with 2 additions and 2 deletions

View File

@ -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