Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
apk-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
60
Issues
60
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
apk-tools
Commits
462bb3b8
Commit
462bb3b8
authored
Sep 06, 2013
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solver: if pinning is specified, it overrides preferred repos
add also a test case for this
parent
0fe8507f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
1 deletion
+20
-1
src/solver.c
src/solver.c
+1
-1
test/pinning-basic.repo
test/pinning-basic.repo
+6
-0
test/pinning-overlay1.repo
test/pinning-overlay1.repo
+6
-0
test/pinning13.test
test/pinning13.test
+7
-0
No files found.
src/solver.c
View file @
462bb3b8
...
...
@@ -256,7 +256,7 @@ static void inherit_pinning(struct apk_solver_state *ss, struct apk_package *pkg
pkg
->
ss
.
pinning_allowed
|=
pinning
;
pkg
->
ss
.
tag_ok
|=
!!
(
repos
&
repo_mask
);
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
));
}
}
...
...
test/pinning-basic.repo
View file @
462bb3b8
...
...
@@ -18,3 +18,9 @@ S:1
I:1
D:a>=2
C:Q1eVpkasfqZAukArrYbg324xt4WUX=
P:samever
V:10
S:1
I:1
test/pinning-overlay1.repo
View file @
462bb3b8
...
...
@@ -18,3 +18,9 @@ S:1
I:1
D:a>=3
C:Q1eVpkasfqZAukArrYbg324xt4WUr=
P:samever
V:10
S:1
I:1
test/pinning13.test
0 → 100644
View file @
462bb3b8
@
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment