summaryrefslogtreecommitdiff
path: root/src/add.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-01-13 10:37:30 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-01-13 10:39:06 +0200
commit2ea61da9d99a64aa0358b9186447310c98de9a77 (patch)
tree2543c5780eaeea41fa271b9ebd64c91aaf5546e7 /src/add.c
parent1f9a36de6828b87ba9d7dedcae2de6092eed4f41 (diff)
downloadapk-tools-2ea61da9d99a64aa0358b9186447310c98de9a77.tar.gz
apk-tools-2ea61da9d99a64aa0358b9186447310c98de9a77.tar.bz2
apk-tools-2ea61da9d99a64aa0358b9186447310c98de9a77.tar.xz
apk-tools-2ea61da9d99a64aa0358b9186447310c98de9a77.zip
add: make repository tag pinning stronger
Previously we would not upgrade just by doing "apk add foo@tag" if foo was already installed. It required explicit '-u'. This allows 'apk add' to explicitly prefer the newly specified pinning.
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 b26018e..34ed9a3 100644
--- a/src/add.c
+++ b/src/add.c
@@ -127,7 +127,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,
+ actx->solver_flags | APK_SOLVERF_PREFER_TAG,
actx->solver_flags);
} else {
apk_deps_add(&virtpkg->depends, &dep);