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
15
Merge Requests
15
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
eaaba3ee
Commit
eaaba3ee
authored
Jan 17, 2012
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade: make -a reset versioned dependencies like it used to
regression from upgrade to the new solver system.
parent
64b03ab6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
2 deletions
+21
-2
src/upgrade.c
src/upgrade.c
+21
-2
No files found.
src/upgrade.c
View file @
eaaba3ee
...
...
@@ -94,7 +94,8 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
{
struct
upgrade_ctx
*
uctx
=
(
struct
upgrade_ctx
*
)
ctx
;
unsigned
short
solver_flags
;
int
r
;
struct
apk_dependency_array
*
world
=
NULL
;
int
i
,
r
;
solver_flags
=
APK_SOLVERF_UPGRADE
|
uctx
->
solver_flags
;
if
(
!
uctx
->
no_self_upgrade
)
{
...
...
@@ -103,7 +104,25 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
return
r
;
}
return
apk_solver_commit
(
db
,
solver_flags
,
db
->
world
);
if
(
solver_flags
&
APK_SOLVERF_AVAILABLE
)
{
apk_dependency_array_copy
(
&
world
,
db
->
world
);
for
(
i
=
0
;
i
<
world
->
num
;
i
++
)
{
struct
apk_dependency
*
dep
=
&
world
->
item
[
i
];
if
(
dep
->
result_mask
==
APK_DEPMASK_CHECKSUM
)
{
dep
->
result_mask
=
APK_DEPMASK_REQUIRE
;
dep
->
version
=
apk_blob_atomize
(
APK_BLOB_NULL
);
}
}
}
else
{
world
=
db
->
world
;
}
r
=
apk_solver_commit
(
db
,
solver_flags
,
world
);
if
(
solver_flags
&
APK_SOLVERF_AVAILABLE
)
apk_dependency_array_free
(
&
world
);
return
r
;
}
static
struct
apk_option
upgrade_options
[]
=
{
...
...
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