taking multimaps for ignoring capabilities

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 69714e5205e31177404ee834970c15ee3dffb3b8..2eea6074829911ed5f766ad769f6b445d8a103ed 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -230,7 +230,7 @@ void
 Resolver::addIgnoreConflict (const PoolItem_Ref item,
                   const Capability & capability)
 {
-    _ignoreConflicts[item] = capability;
+    _ignoreConflicts.insert(make_pair(item, capability));
 }
 
 
@@ -238,7 +238,7 @@ void
 Resolver::addIgnoreRequires (const PoolItem_Ref item,
                             const Capability & capability)
 {
-    _ignoreRequires[item] = capability;
+    _ignoreRequires.insert(make_pair(item, capability));
 }
 
 void

diff --git a/zypp/solver/detail/ResolverQueue.h b/zypp/solver/detail/ResolverQueue.h
index 6d0a5df9a5aa21d82242f20934337e6ba3956843..42bd7f18cfeb6f979fd8811131c848bb18f1e678 100644 (file)
--- a/zypp/solver/detail/ResolverQueue.h
+++ b/zypp/solver/detail/ResolverQueue.h
@@ -47,7 +47,7 @@ namespace zypp
     { ///////////////////////////////////////////////////////////////////
 
 typedef std::list <ResolverQueue_Ptr> ResolverQueueList;
-typedef std::map<PoolItem_Ref,Capability> IgnoreMap;
+typedef std::multimap<PoolItem_Ref,Capability> IgnoreMap;
            
 
 ///////////////////////////////////////////////////////////////////