jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solver: if pinning is specified, it overrides preferred repos 

add also a test case for this
cute-signatures
Timo Teräs 2013-09-06 14:21:59 +03:00
parent 0fe8507f9d
commit 462bb3b8d3
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/solver.c
View File

@ -256,7 +256,7 @@ static void inherit_pinning(struct apk_solver_state *ss, struct apk_package *pkg
pkg->ss.pinning_allowed |= pinning; pkg->ss.pinning_allowed |= pinning;
pkg->ss.tag_ok |= !!(repos & repo_mask); pkg->ss.tag_ok |= !!(repos & repo_mask);
if (prefer) { if (prefer) {
pkg->ss.pinning_preferred |= pinning; pkg->ss.pinning_preferred = pinning;
pkg->ss.tag_preferred = !!(repos & apk_db_get_pinning_mask_repos(ss->db, pkg->ss.pinning_preferred)); pkg->ss.tag_preferred = !!(repos & apk_db_get_pinning_mask_repos(ss->db, pkg->ss.pinning_preferred));
} }
} }

6
test/pinning-basic.repo
View File

@ -18,3 +18,9 @@ S:1
I:1 I:1
D:a>=2 D:a>=2
C:Q1eVpkasfqZAukArrYbg324xt4WUX=
P:samever
V:10
S:1
I:1

6
test/pinning-overlay1.repo
View File

@ -18,3 +18,9 @@ S:1
I:1 I:1
D:a>=3 D:a>=3
C:Q1eVpkasfqZAukArrYbg324xt4WUr=
P:samever
V:10
S:1
I:1

7
test/pinning13.test Normal file
View File

@ -0,0 +1,7 @@
@ARGS
--test-repo pinning-basic.repo
--test-repo testing:pinning-overlay1.repo
add samever@testing
@EXPECT
(1/1) Installing samever@testing (10)
OK: 0 MiB in 0 packages