summaryrefslogtreecommitdiff
path: root/src/apk_solver_data.h
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-12 13:24:07 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-13 18:22:00 +0300
commite7fd4d03bfd430053cca5161846889d5e2b1e2a1 (patch)
tree8a8d45d2dd52d30990c52e498be01831b55c7c7c /src/apk_solver_data.h
parent426a12686e6e6dcce11616c774176c01ad0985f9 (diff)
downloadapk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.tar.gz
apk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.tar.bz2
apk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.tar.xz
apk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.zip
solver: rewrite as deductive solver -- pinning support
Fix also pinning test cases to be more sane.
Diffstat (limited to 'src/apk_solver_data.h')
-rw-r--r--src/apk_solver_data.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/apk_solver_data.h b/src/apk_solver_data.h
index 47496ac..b1047f0 100644
--- a/src/apk_solver_data.h
+++ b/src/apk_solver_data.h
@@ -21,8 +21,6 @@ struct apk_solver_name_state {
struct list_head unresolved_list;
struct apk_provider chosen;
- unsigned int preferred_pinning;
-
unsigned short requirers;
unsigned short merge_index;
unsigned short max_dep_chain;
@@ -39,9 +37,13 @@ struct apk_solver_name_state {
struct apk_solver_package_state {
unsigned int conflicts;
unsigned short max_dep_chain;
+ unsigned short pinning_allowed;
+ unsigned short pinning_preferred;
unsigned solver_flags : 4;
unsigned solver_flags_inheritable : 4;
unsigned seen : 1;
+ unsigned tag_ok : 1;
+ unsigned tag_preferred : 1;
unsigned available : 1;
unsigned in_changeset : 1;
unsigned iif_triggered : 1;