ref: refs/heads/SuSE-Code-11-Branch
commit 6bbb04832e21118810a5f527cc389580503e0b69
Author: Michael Schroeder
Date: Thu Sep 3 15:35:44 2009 +0200
- fix multiversion patch handling for real
---
VERSION.cmake | 4 ++--
package/libsatsolver.changes | 6 ++++++
src/pool.c | 9 ++++++---
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/VERSION.cmake b/VERSION.cmake
index ac6d668..513bada 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
SET(LIBSATSOLVER_MAJOR "0")
SET(LIBSATSOLVER_MINOR "13")
-SET(LIBSATSOLVER_PATCH "7")
+SET(LIBSATSOLVER_PATCH "8")
-# last released 0.13.7
+# last released 0.13.8
diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index b84cfce..28f6740 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Sep 3 15:24:41 CEST 2009 - mls@suse.de
+
+- fix multiversion handling for real (#bnc531899)
+- 0.13.8
+
+-------------------------------------------------------------------
Wed May 20 12:32:16 CEST 2009 - mls@suse.de
- add workaround for multiversion supplements (bnc#501088)
diff --git a/src/pool.c b/src/pool.c
index 8daa57a..7e9afd4 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -1387,7 +1387,7 @@ static inline Id dep2name(Pool *pool, Id dep)
return dep;
}
-static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id dep)
+static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id con)
{
Id p, pp;
Solvable *sn = pool->solvables + n;
@@ -1397,8 +1397,11 @@ static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n
Solvable *s = pool->solvables + p;
if (s->name != sn->name || s->arch != sn->arch)
continue;
- if ((map[p] & 9) == 9)
- return 1;
+ if ((map[p] & 9) != 9)
+ continue;
+ if (pool_match_nevr(pool, pool->solvables + p, con))
+ continue;
+ return 1; /* found installed package that doesn't conflict */
}
return 0;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org