summaryrefslogtreecommitdiff
path: root/src/add.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-02-15 13:57:36 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-02-15 13:57:36 +0200
commit41fb3a4f9e5949a66fedc069f94b75c18614728d (patch)
treeff3ce7bcba056015a01edabc9e55d50894b9eb2a /src/add.c
parent29064d88f3a972b69a006d7a8092159bd65ef03f (diff)
downloadapk-tools-41fb3a4f9e5949a66fedc069f94b75c18614728d.tar.gz
apk-tools-41fb3a4f9e5949a66fedc069f94b75c18614728d.tar.bz2
apk-tools-41fb3a4f9e5949a66fedc069f94b75c18614728d.tar.xz
apk-tools-41fb3a4f9e5949a66fedc069f94b75c18614728d.zip
solver, db: repository pinning improvements
* solver internally calculates now using tags; not repository masks * installeddb now contains the tag name where the package came from -> we can now handle upgrades properly * the pinning is still a preference, and not strictly enforced; versioned dependencies may overrule preference
Diffstat (limited to 'src/add.c')
-rw-r--r--src/add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/add.c b/src/add.c
index 238a388..36f51cf 100644
--- a/src/add.c
+++ b/src/add.c
@@ -120,7 +120,7 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv)
if (virtpkg == NULL) {
apk_deps_add(&world, &dep);
apk_solver_set_name_flags(dep.name,
- actx->solver_flags | APK_SOLVERF_PREFER_TAG,
+ actx->solver_flags,
actx->solver_flags);
} else {
apk_deps_add(&virtpkg->depends, &dep);