From 849ab8ffae064d0d20638e65db2b5a31691f462f Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 21 Apr 2008 16:57:43 +0000 Subject: [PATCH] added self conflicts in the error message --- zypp/solver/detail/SATResolver.cc | 4 ++++ 1 file changed, 4 insertions(+) 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); -- 2.34.1