Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7689 - /trunk/zypper/src/zypper-misc.cc
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Mon, 29 Oct 2007 16:01:53 -0000
  • Message-id: <20071029160153.468DF2FC78@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Mon Oct 29 17:01:52 2007
New Revision: 7689

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7689&view=rev
Log:
- (s)kip option added to the dependency problem resolution prompt

Modified:
trunk/zypper/src/zypper-misc.cc

Modified: trunk/zypper/src/zypper-misc.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=7689&r1=7688&r2=7689&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Mon Oct 29 17:01:52 2007
@@ -431,8 +431,8 @@
// 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 @@
// 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 @@
}

if (retry)
+ {
+ cout_n << _("Resolving dependencies...") << endl;
resolver->applySolutions (todo);
+ }
return retry;
}


--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages