From: Stefan Schubert <schubi@suse.de>
Date: Mon, 21 Apr 2008 16:57:43 +0000 (+0000)
Subject: added self conflicts in the error message
X-Git-Tag: 6.6.0~1015
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=849ab8ffae064d0d20638e65db2b5a31691f462f;p=platform%2Fupstream%2Flibzypp.git

added self conflicts in the error message
---

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index c3f6fd722..6136c56e0 100644
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -884,6 +884,10 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI
 	  s2 = pool_id2solvable(pool, target);
 	  ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2));
 	  break;
+      case SOLVER_PROBLEM_SELF_CONFLICT:
+	  s = pool_id2solvable(pool, source);
+	  ret = str::form (_("Solvable %s conflicts with %s provided by itself"), solvable2str(pool, s), dep2str(pool, dep));
+          break;	  
       case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE:
 	  ignoreId = source; // for setting weak dependencies
 	  s = pool_id2solvable(pool, source);