From 2ea61da9d99a64aa0358b9186447310c98de9a77 Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Fri, 13 Jan 2012 10:37:30 +0200
Subject: 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.
---
 src/add.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/add.c')

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);
-- 
cgit v1.2.3-60-g2f50