Author: schubi2 Date: Wed Nov 21 10:23:41 2007 New Revision: 7875 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7875&view=rev Log: Error message has been changed #332470 Modified: trunk/libzypp/zypp/solver/detail/ResolverContext.cc trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Modified: trunk/libzypp/zypp/solver/detail/ResolverContext.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/ResolverContext.cc?rev=7875&r1=7874&r2=7875&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverContext.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverContext.cc Wed Nov 21 10:23:41 2007 @@ -1546,8 +1546,8 @@ } } -// 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) Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc?rev=7875&r1=7874&r2=7875&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Wed Nov 21 10:23:41 2007 @@ -390,8 +390,8 @@ 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)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org