- fix problem_to_solutions segfault

- bump version

diff --git a/VERSION.cmake b/VERSION.cmake
index 1cfc4c281fd8c7acb7942dcbb5fe7f542f0d8612..64f17b386e284c0641b75305362111edd72fd464 100644 (file)
--- 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 9fdac4ed7d77d5501465bb24652a331a2eb81b39..0c677bf59376757477f0e68f1dbc157aa76d2481 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 

diff --git a/src/solver.c b/src/solver.c
index 7906e548eb6cc4b9543d2c2820996ee5dad4e117..44d705184a4e70be7a19412aca7696f55daba617 100644 (file)
--- 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 13ac96ce583b5eb73cdd85e397ee31f38144fd3b..817848eb6923499e3485beb54eb54b014af8f6f1 100644 (file)
--- 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