diff options
Diffstat (limited to 'src/solver.h')
| -rw-r--r-- | src/solver.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/solver.h b/src/solver.h index 758f1eb..be240c9 100644 --- a/src/solver.h +++ b/src/solver.h @@ -107,19 +107,13 @@ struct _Solver { /* our decisions: */ Queue decisionq; /* >0:install, <0:remove/conflict */ Queue decisionq_why; /* index of rule, Offset into rules */ + Queue decisionq_reason; /* reason for decision, indexed by level */ Id *decisionmap; /* map for all available solvables, * = 0: undecided * > 0: level of decision when installed, * < 0: level of decision when conflict */ - int decisioncnt_jobs; - int decisioncnt_update; - int decisioncnt_keep; - int decisioncnt_resolve; - int decisioncnt_weak; - int decisioncnt_orphan; - /* learnt rule history */ Queue learnt_why; Queue learnt_pool; @@ -166,6 +160,7 @@ struct _Solver { int bestobeypolicy; /* true: stay in policy with the best rules */ int noautotarget; /* true: do not assume targeted for up/dup jobs that contain no installed solvable */ int focus_installed; /* true: resolve update rules first */ + int focus_best; /* true: resolve job dependencies first */ int do_yum_obsoletes; /* true: add special yumobs rules */ int urpmreorder; /* true: do special urpm package reordering */ @@ -203,6 +198,9 @@ struct _Solver { Queue *favorq; Map favormap; /* favored / disfavored packages */ Map isdisfavormap; + + int installedpos; /* for resolve_installed */ + int do_extra_reordering; /* reorder for future installed packages */ #endif /* LIBSOLV_INTERNAL */ }; @@ -309,6 +307,7 @@ typedef struct _Solver Solver; #define SOLVER_FLAG_YUM_OBSOLETES 21 #define SOLVER_FLAG_NEED_UPDATEPROVIDE 22 #define SOLVER_FLAG_URPM_REORDER 23 +#define SOLVER_FLAG_FOCUS_BEST 24 #define GET_USERINSTALLED_NAMES (1 << 0) /* package names instead of ids */ #define GET_USERINSTALLED_INVERTED (1 << 1) /* autoinstalled */ |