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
61
Issues
61
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
5fdc391c
Commit
5fdc391c
authored
Mar 11, 2014
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solver: fixes to install_if handling
parent
f19566f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
14 deletions
+21
-14
src/solver.c
src/solver.c
+21
-14
No files found.
src/solver.c
View file @
5fdc391c
...
...
@@ -127,7 +127,7 @@ static void queue_unresolved(struct apk_solver_state *ss, struct apk_name *name)
return
;
want
=
(
name
->
ss
.
requirers
>
0
)
||
(
name
->
ss
.
has_iif
);
dbg_printf
(
"queue_unresolved: %s, want=%d
\n
"
,
name
->
name
,
want
);
dbg_printf
(
"queue_unresolved: %s, want=%d
(requirers=%d, has_iif=%d)
\n
"
,
name
->
name
,
want
,
name
->
ss
.
requirers
,
name
->
ss
.
has_iif
);
if
(
want
&&
!
list_hashed
(
&
name
->
ss
.
unresolved_list
))
list_add
(
&
name
->
ss
.
unresolved_list
,
&
ss
->
unresolved_head
);
else
if
(
!
want
&&
list_hashed
(
&
name
->
ss
.
unresolved_list
))
...
...
@@ -268,7 +268,7 @@ static void apply_constraint(struct apk_solver_state *ss, struct apk_package *pp
unsigned
int
solver_flags_inherit
=
ss
->
solver_flags_inherit
;
int
is_provided
;
dbg_printf
(
"apply_constraint: %s%s%s"
BLOB_FMT
"
\n
"
,
dbg_printf
(
"
apply_constraint: %s%s%s"
BLOB_FMT
"
\n
"
,
dep
->
conflict
?
"!"
:
""
,
name
->
name
,
apk_version_op_string
(
dep
->
result_mask
),
...
...
@@ -282,7 +282,7 @@ static void apply_constraint(struct apk_solver_state *ss, struct apk_package *pp
struct
apk_package
*
pkg0
=
p0
->
pkg
;
is_provided
=
apk_dep_is_provided
(
dep
,
p0
);
dbg_printf
(
"apply_constraint: provider: %s-"
BLOB_FMT
": %d
\n
"
,
dbg_printf
(
"
apply_constraint: provider: %s-"
BLOB_FMT
": %d
\n
"
,
pkg0
->
name
->
name
,
BLOB_PRINTF
(
*
p0
->
version
),
is_provided
);
pkg0
->
ss
.
conflicts
+=
!
is_provided
;
...
...
@@ -377,15 +377,16 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
if
(
reevaluate_iif
)
{
pkg
->
ss
.
iif_triggered
=
1
;
foreach_array_item
(
dep
,
pkg
->
install_if
)
{
if
(
!
dependency_satisfiable
(
ss
,
dep
))
{
if
(
!
(
dep
->
name
->
ss
.
locked
&&
apk_dep_is_provided
(
dep
,
&
dep
->
name
->
ss
.
chosen
)))
{
pkg
->
ss
.
iif_triggered
=
0
;
break
;
}
}
has_iif
|=
pkg
->
ss
.
iif_triggered
;
}
has_iif
|=
pkg
->
ss
.
iif_triggered
;
if
(
name
->
ss
.
requirers
==
0
&&
!
pkg
->
ss
.
iif_triggered
)
if
(
name
->
ss
.
requirers
==
0
)
continue
;
/* merge common dependencies */
...
...
@@ -602,6 +603,7 @@ static void assign_name(struct apk_solver_state *ss, struct apk_name *name, stru
disqualify_package
(
ss
,
p0
->
pkg
,
"conflicting provides"
);
}
reevaluate_reverse_deps
(
ss
,
name
);
reevaluate_reverse_installif
(
ss
,
name
);
}
static
void
select_package
(
struct
apk_solver_state
*
ss
,
struct
apk_name
*
name
)
...
...
@@ -610,7 +612,7 @@ static void select_package(struct apk_solver_state *ss, struct apk_name *name)
struct
apk_package
*
pkg
=
NULL
;
struct
apk_dependency
*
d
;
dbg_printf
(
"select_package: %s
\n
"
,
name
->
name
);
dbg_printf
(
"select_package: %s
(requirers=%d, iif=%d)
\n
"
,
name
->
name
,
name
->
ss
.
requirers
,
name
->
ss
.
has_iif
);
if
(
name
->
ss
.
requirers
||
name
->
ss
.
has_iif
)
{
foreach_array_item
(
p
,
name
->
providers
)
{
...
...
@@ -756,6 +758,8 @@ static void cset_gen_name_change(struct apk_solver_state *ss, struct apk_name *n
pkg
->
ss
.
in_changeset
=
1
;
pkg
->
name
->
ss
.
in_changeset
=
1
;
foreach_array_item
(
d
,
pkg
->
provides
)
d
->
name
->
ss
.
in_changeset
=
1
;
opkg
=
pkg
->
name
->
ss
.
installed_pkg
;
if
(
opkg
)
{
...
...
@@ -881,16 +885,19 @@ restart:
list_init
(
&
ss
->
dirty_head
);
list_init
(
&
ss
->
unresolved_head
);
dbg_printf
(
"
apply
ing world
\n
"
);
dbg_printf
(
"
discover
ing world
\n
"
);
ss
->
prefer_pinning
=
1
;
ss
->
solver_flags_inherit
=
solver_flags
;
foreach_array_item
(
d
,
world
)
{
if
(
d
->
broken
)
continue
;
name
=
d
->
name
;
discover_name
(
ss
,
d
->
name
);
ss
->
pinning_inherit
=
BIT
(
d
->
repository_tag
);
apply_constraint
(
ss
,
NULL
,
d
);
if
(
!
d
->
broken
)
discover_name
(
ss
,
d
->
name
);
}
dbg_printf
(
"applying world
\n
"
);
foreach_array_item
(
d
,
world
)
{
if
(
!
d
->
broken
)
{
ss
->
pinning_inherit
=
BIT
(
d
->
repository_tag
);
apply_constraint
(
ss
,
NULL
,
d
);
}
}
ss
->
solver_flags_inherit
=
0
;
ss
->
pinning_inherit
=
0
;
...
...
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