From 6821e07e6fcd411f11b4a5e514ddcbd042e157e8 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 4 Mar 2009 14:40:19 +0100 Subject: [PATCH] - fix problem_to_solutions segfault - bump version --- VERSION.cmake | 6 +++--- package/libsatsolver.changes | 7 +++++++ src/solver.c | 6 +++--- src/solver.h | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 1cfc4c2..64f17b3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -45,7 +45,7 @@ # SET(LIBSATSOLVER_MAJOR "0") -SET(LIBSATSOLVER_MINOR "13") -SET(LIBSATSOLVER_PATCH "5") +SET(LIBSATSOLVER_MINOR "14") +SET(LIBSATSOLVER_PATCH "0") -# last released 0.13.5 +# last released 0.14.0 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 9fdac4e..0c677bf 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 4 14:39:00 CET 2009 - mls@suse.de + +- fix problem_to_solutions segfault +- bump version to 0.14 to make it different from code11 branch +- 0.14.0 + +------------------------------------------------------------------- Mon Mar 2 18:20:22 CET 2009 - mls@suse.de - add solver_trivial_installable() to fix multiversion patches [bnc#480303] diff --git a/src/solver.c b/src/solver.c index 7906e54..44d7051 100644 --- a/src/solver.c +++ b/src/solver.c @@ -3608,7 +3608,7 @@ problems_to_solutions(Solver *solv, Queue *job) /* infarch rule, find replacement */ assert(solv->rules[why].p < 0); name = pool->solvables[-solv->rules[why].p].name; - while (why >= solv->infarchrules && pool->solvables[-solv->rules[why - 1].p].name == name) + while (why > solv->infarchrules && pool->solvables[-solv->rules[why - 1].p].name == name) why--; p = 0; for (; why < solv->infarchrules_end && pool->solvables[-solv->rules[why].p].name == name; why++) @@ -3628,10 +3628,10 @@ problems_to_solutions(Solver *solv, Queue *job) /* dist upgrade rule, find replacement */ assert(solv->rules[why].p < 0); name = pool->solvables[-solv->rules[why].p].name; - while (why >= solv->infarchrules && pool->solvables[-solv->rules[why - 1].p].name == name) + while (why > solv->duprules && pool->solvables[-solv->rules[why - 1].p].name == name) why--; p = 0; - for (; why < solv->infarchrules_end && pool->solvables[-solv->rules[why].p].name == name; why++) + for (; why < solv->duprules_end && pool->solvables[-solv->rules[why].p].name == name; why++) if (solv->decisionmap[-solv->rules[why].p] > 0) { p = -solv->rules[why].p; diff --git a/src/solver.h b/src/solver.h index 13ac96c..817848e 100644 --- a/src/solver.h +++ b/src/solver.h @@ -228,6 +228,7 @@ typedef struct solver { #define SOLVER_SELECTMASK 0xff +#define SOLVER_NOOP 0x0000 #define SOLVER_INSTALL 0x0100 #define SOLVER_ERASE 0x0200 #define SOLVER_UPDATE 0x0300 -- 2.7.4