From: Stefan Schubert Date: Wed, 21 Nov 2007 09:23:41 +0000 (+0000) Subject: Error message has been changed #332470 X-Git-Tag: BASE-SuSE-Linux-11_0-Branch~683 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9a9d0472029ea6a05d640c4e3a79ff0a5d78cd4;p=platform%2Fupstream%2Flibzypp.git Error message has been changed #332470 --- diff --git a/zypp/solver/detail/ResolverContext.cc b/zypp/solver/detail/ResolverContext.cc index 2f85e26..5b398cc 100644 --- a/zypp/solver/detail/ResolverContext.cc +++ b/zypp/solver/detail/ResolverContext.cc @@ -1546,8 +1546,8 @@ struct RequirementMet } } -// ERR << "RequirementMet(" << provider << ", " << match << ") [capability " << -// capability << "] -> " << (flag ? "true" : "false") << endl; +// _XDEBUG( "RequirementMet(" << provider << ", " << match << ") [capability " << +// "] -> " << (flag ? "true" : "false") ); if ( (installed // Checking as long as we have found an installed item && !*installed) diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc index 3cc935a..d534042 100644 --- a/zypp/solver/detail/Resolver_problems.cc +++ b/zypp/solver/detail/Resolver_problems.cc @@ -390,8 +390,8 @@ Resolver::problems (const bool ignoreValidSolution) const if (!_tryAllPossibilities // a second run with ALL possibilities has not been tried && skippedPossibilities) { // possible other solutions skipped // give the user an additional solution for trying all branches - string what = _("No valid solution found with just resolvables of best architecture."); - string details = _("With this run only resolvables with the best architecture have been regarded.\n"); + string what = _("No valid solution found with just resolvables which suitalbe best suitable for your system."); + string details = _("With this run only resolvables with the best fit have been regarded.\n"); details = details + _("Regarding all possible resolvables takes time, but can come to a valid result."); ResolverProblem_Ptr problem = new ResolverProblem (what, details); problem->addSolution (new ProblemSolutionAllBranches (problem));