ref: refs/heads/master
commit dc2e18ba3faf5e5177aebb7f25f4f1f71bf568c2
Author: Michael Schroeder
Date: Thu Sep 3 15:41:25 2009 +0200
- fix multiversion handling for real
---
src/pool.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/pool.c b/src/pool.c
index 48bb5f2..21c52c2 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -1544,7 +1544,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;
@@ -1554,9 +1554,12 @@ 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
