From 81192f94820f4b8e108901577fb8740fe113127e Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Mon, 29 Oct 2007 16:01:52 +0000 Subject: [PATCH] - (s)kip option added to the dependency problem resolution prompt --- src/zypper-misc.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc index 2a7f72f..a04b5f1 100644 --- a/src/zypper-misc.cc +++ b/src/zypper-misc.cc @@ -431,8 +431,8 @@ tribool show_problem (const ResolverProblem & prob, ProblemSolutionList & todo) // without solutions, its useless to prompt if (solutions.empty()) return false; - // input prompt - cerr << _("number, (r)etry or (c)ancel> ") << flush; + // TranslatorExplanation: dependency problem solution input prompt + cerr << _("Choose the number, (s)kip, (r)etry or (c)ancel> ") << flush; string reply_s = str::getline (cin, zypp::str::TRIM); if (! cin.good()) { @@ -448,11 +448,14 @@ tribool show_problem (const ResolverProblem & prob, ProblemSolutionList & todo) // translators: corresponds to (c)ancel else if (reply_s == _("c")) return false; + // translators: corresponds to (s)kip + else if (reply_s == _("s")) + return indeterminate; // continue with next problem str::strtonum (reply_s, reply); } while (reply <= 0 || reply >= n); - cerr << format (_("Applying solution %s")) % reply << endl; + cout_n << format (_("Applying solution %s")) % reply << endl; ProblemSolutionList::iterator reply_i = solutions.begin (); advance (reply_i, reply - 1); todo.push_back (*reply_i); @@ -502,7 +505,10 @@ bool show_problems () } if (retry) + { + cout_n << _("Resolving dependencies...") << endl; resolver->applySolutions (todo); + } return retry; } -- 2.7.4