From 974581e5e2cf05e5e585cd3358b5af979bc0c0bf Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 23 Aug 2007 11:49:46 +0000 Subject: [PATCH] Do not strip resolvables which have the same name but different kind --- zypp/solver/detail/ResolverInfo.cc | 2 +- zypp/solver/detail/ResolverInfoContainer.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zypp/solver/detail/ResolverInfo.cc b/zypp/solver/detail/ResolverInfo.cc index dfe0068..141d08e 100644 --- a/zypp/solver/detail/ResolverInfo.cc +++ b/zypp/solver/detail/ResolverInfo.cc @@ -258,7 +258,7 @@ ResolverInfo::isAbout (PoolItem_Ref item) const if (!_affected) return false; - return _affected->name() == item->name(); + return _affected->name() == item->name() && _affected->kind() == item->kind(); } /////////////////////////////////////////////////////////////////// diff --git a/zypp/solver/detail/ResolverInfoContainer.cc b/zypp/solver/detail/ResolverInfoContainer.cc index c43c9d3..2cdad62 100644 --- a/zypp/solver/detail/ResolverInfoContainer.cc +++ b/zypp/solver/detail/ResolverInfoContainer.cc @@ -171,7 +171,8 @@ ResolverInfoContainer::mentions (PoolItem_Ref item) const // Search item_list for any mention of the item. for (PoolItemList::const_iterator iter = _item_list.begin(); iter != _item_list.end(); iter++) { - if ((*iter)->name() == item->name()) { + if ((*iter)->name() == item->name() + && (*iter)->kind() == item->kind()) { return true; } } -- 2.7.4