diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-02-16 11:45:54 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-16 11:45:54 +0200 |
| commit | 53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a (patch) | |
| tree | af831844df669e95094b4136c6204a23759c8b01 | |
| parent | 0800d7e050b738e7faa848291d6021175b853e29 (diff) | |
| download | apk-tools-53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a.tar.gz apk-tools-53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a.tar.bz2 apk-tools-53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a.tar.xz apk-tools-53f8a36c1f621b5d53cb921bbda6ff0b2ecc756a.zip | |
solver: fix allowed pinning calculation
| -rw-r--r-- | src/solver.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |