From: Stefan Schubert <schubi@suse.de>
Date: Sat, 11 Feb 2006 13:14:09 +0000 (+0000)
Subject: Showing correct solutions, if glibc will be deleted
X-Git-Tag: BASE-SuSE-SLE-10-SP2-Branch~2313
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da560a5668da5a257d3ef19b6b4c60286cfdf4b6;p=platform%2Fupstream%2Flibzypp.git

Showing correct solutions, if glibc will be deleted
---

diff --git a/zypp/solver/detail/ProblemSolutionIgnore.cc b/zypp/solver/detail/ProblemSolutionIgnore.cc
index 3abc818..5220659 100644
--- a/zypp/solver/detail/ProblemSolutionIgnore.cc
+++ b/zypp/solver/detail/ProblemSolutionIgnore.cc
@@ -51,7 +51,7 @@ ProblemSolutionIgnoreRequires::ProblemSolutionIgnoreRequires( ResolverProblem_Pt
 							      const Capability & capability)
     : ProblemSolution (parent, "", "")
 {
-	_description = _("Ignoring this requirement");
+	_description = _("Ignore this requirement.");
 	addAction ( new InjectSolutionAction (item, capability, REQUIRES));
 }
 
@@ -60,7 +60,7 @@ ProblemSolutionIgnoreRequires::ProblemSolutionIgnoreRequires( ResolverProblem_Pt
 							      const Capability & capability)
     : ProblemSolution (parent, "", "")
 {
-	_description = _("Ignoring this requirement");
+	_description = _("Ignore this requirement for all other resolvables.");
 	for (PoolItemList::const_iterator iter = itemList.begin();
 	     iter != itemList.end(); iter++) {
 	    addAction ( new InjectSolutionAction (*iter, capability, REQUIRES));
@@ -74,7 +74,7 @@ ProblemSolutionIgnoreConflicts::ProblemSolutionIgnoreConflicts( ResolverProblem_
     : ProblemSolution (parent, "", "")
 {
 	// TranslatorExplanation %s = name of package, patch, selection ...
-	_description = str::form (_("Ignoring conflict of %s"),
+	_description = str::form (_("Ignore this conflict of %s."),
 				  item->name().c_str());
 	addAction (new InjectSolutionAction (item, capability, CONFLICTS, otherItem));	
 }
@@ -83,7 +83,7 @@ ProblemSolutionIgnoreArch::ProblemSolutionIgnoreArch( ResolverProblem_Ptr parent
 						      PoolItem_Ref item )
     : ProblemSolution (parent, "", "")
 {
-    _description = _("Ignoring Architecture");
+    _description = _("ignore architecture");
     addAction ( new InjectSolutionAction (item, Capability(), ARCHITECTURE));
 }
 
@@ -93,7 +93,7 @@ ProblemSolutionIgnoreInstalled::ProblemSolutionIgnoreInstalled( ResolverProblem_
     : ProblemSolution (parent, "", "")
 {
 	// TranslatorExplanation %s = name of package, patch, selection ...
-	_description = str::form (_("Ignoring that %s is already set to install"),
+	_description = str::form (_("Ignore that %s is already set to install."),
 				  item->name().c_str());
 	addAction (new InjectSolutionAction (item, Capability(), INSTALLED, otherItem));	
 }
diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc
index 0d381d5..56eb247 100644
--- a/zypp/solver/detail/Resolver_problems.cc
+++ b/zypp/solver/detail/Resolver_problems.cc
@@ -64,11 +64,30 @@ namespace zypp
 using namespace std;
 
 typedef map<PoolItem_Ref, ResolverInfo_Ptr> ProblemMap;
-
+typedef multimap<PoolItem_Ref, Capability> ItemCapabilityMap;
+
+// match template over ItemCapabilityMap
+template <class K, class V>
+class cap_equals {
+  private:
+    V value;
+public:
+    cap_equals (const V& v)
+	: value(v) {
+    }
+    // comparison
+    bool operator() (pair<const K, V> elem) {
+	return value.matches (elem.second) == CapMatch::yes;
+    }
+};
+	
 // set resolvables with errors
 
 typedef struct {
     ProblemMap problems;
+    // A map of PoolItems which provides a capability but are set
+    // for uninstallation
+    ItemCapabilityMap provideAndDeleteMap;  
 } ResItemCollector;
 
 
@@ -81,6 +100,21 @@ collector_cb (ResolverInfo_Ptr info, void *data)
 	&& info->error()) {
 	collector->problems[item] = info;
     }
+    // Collicting items which are providing requirements but they
+    // are set for uninstall
+    if (info->type() == RESOLVER_INFO_TYPE_UNINSTALL_PROVIDER) {
+	ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast<const ResolverInfoMisc>(info);
+	// does entry already exists ?
+	ItemCapabilityMap::iterator pos = find_if (collector->provideAndDeleteMap.begin(),
+						   collector->provideAndDeleteMap.end(),
+						   cap_equals<PoolItem_Ref, Capability>(misc_info->capability()));
+	
+	if (pos == collector->provideAndDeleteMap.end()) {
+	    _XDEBUG ("Inserting " << misc_info->capability() << "/" <<  misc_info->other()
+		     << " into provideAndDelete map");
+	    collector->provideAndDeleteMap.insert (make_pair( misc_info->other(), misc_info->capability()));
+	}
+    }
 }
 
 struct AllRequires : public resfilter::OnCapMatchCallbackFunctor
@@ -95,7 +129,6 @@ struct AllRequires : public resfilter::OnCapMatchCallbackFunctor
 	return true;
     }
 };
-	
 
 
 ResolverProblemList
@@ -310,14 +343,26 @@ Resolver::problems (void) const
 	    case RESOLVER_INFO_TYPE_NO_OTHER_PROVIDER: {		// There are no alternative installed providers of c [for p]
 		ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast<const ResolverInfoMisc>(info);
 		// TranslatorExplanation %s = name of package, patch, selection ...				
-		what = str::form (_("%s cannot be uninstalled due missing dependencies"), who.c_str());
+		what = str::form (_("%s has missing dependencies"), who.c_str());
 		details = misc_info->message();
 		ResolverProblem_Ptr problem = new ResolverProblem (what, details);
 
-		// keep installed
-		problem->addSolution (new ProblemSolutionKeep (problem, item)); 
-		
-		// Unflag require
+		// Searching for another item which provides this requires BUT has been set to uninstall
+		for (ItemCapabilityMap::const_iterator it = collector.provideAndDeleteMap.begin();
+		     it != collector.provideAndDeleteMap.end(); ++it) {
+		    if (it->second.matches (misc_info->capability()) == CapMatch::yes) {
+			// Do not delete
+			problem->addSolution (new ProblemSolutionKeep (problem, it->first));
+		    }
+		}
+
+		// uninstall
+		problem->addSolution (new ProblemSolutionUninstall (problem, item));
+
+		// Unflag require ONLY for this item
+		problem->addSolution (new ProblemSolutionIgnoreRequires (problem, item, misc_info->capability()));		
+
+		// Unflag ALL require
 		// Evaluating all require Items
 		AllRequires info;
 		Dep dep( Dep::REQUIRES );
@@ -326,7 +371,8 @@ Resolver::problems (void) const
 			      _pool.byCapabilityIndexEnd( misc_info->capability().index(), dep ),   // end()
 			      resfilter::callOnCapMatchIn( dep, misc_info->capability(),
 							   functor::functorRef<bool,PoolItem,Capability>(info)) );
-		problem->addSolution (new ProblemSolutionIgnoreRequires (problem, info.requirers, misc_info->capability()));
+		if (info.requirers.size() > 1)
+		    problem->addSolution (new ProblemSolutionIgnoreRequires (problem, info.requirers, misc_info->capability()));
 
 		problems.push_back (problem);
 		problem_created = true;