do not call {ask_yes_or_no} callback with explicit "(y/N)" otherwise it is

displayed in GUIs (gurpmi/rpmdrake/...)

2 files changed, 5 insertions, 5 deletions

diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 9e944b85..a8d9a2e5 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -112,7 +112,7 @@ foreach my $set (@{$state->{transaction} || []}) {
 	    !$urpm->{options}{auto} && $callbacks->{ask_yes_or_no}->(
 		N("Installation failed"), 
 		N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database", $msg)
-		  . "\n\n" . N("Try to go on anyway? (y/N) ")) or last;
+		  . "\n\n" . N("Try to go on anyway?")) or last;
 	}
 	if (my @bad = grep { $_->[1] eq 'bad' } @error_sources) {
 	    $exit_code = 11;
@@ -122,7 +122,7 @@ foreach my $set (@{$state->{transaction} || []}) {
 	    !$urpm->{options}{auto} && $callbacks->{ask_yes_or_no}->(
 		N("Installation failed"), 
 		N("Installation failed, bad rpms:\n%s", $msg)
-		  . "\n\n" . N("Try to go on anyway? (y/N) ")) or last;
+		  . "\n\n" . N("Try to go on anyway?")) or last;
 	}
     }
 
@@ -233,14 +233,14 @@ foreach my $set (@{$state->{transaction} || []}) {
 		my $msg = N("Installation failed:") . "\n" . join("\n",  map { "\t$_" } @l) . "\n";
 		if (!$no_question && !$install_options_common{nodeps} && ($urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'})) {
 		    if ($callbacks->{ask_yes_or_no}->(N("Installation failed"), 
-						      $msg . N("Try installation without checking dependencies? (y/N) "))) {
+						      $msg . N("Try installation without checking dependencies?"))) {
 			$urpm->{log}("starting installing packages without deps");
 			$install_options_common{nodeps} = 1;
 			goto install;
 		    }
 		} elsif (!$no_question && !$install_options_common{force} && $urpm->{options}{'allow-force'}) {
 		    if ($callbacks->{ask_yes_or_no}->(N("Installation failed"),
-						      $msg . N("Try harder to install (--force)? (y/N) "))) {
+						      $msg . N("Try harder to install (--force)?"))) {
 			$urpm->{log}("starting force installing packages without deps");
 			$install_options_common{force} = 1;
 			goto install;
diff --git a/urpmi b/urpmi
index 4238159f..45203cbc 100755
--- a/urpmi
+++ b/urpmi
@@ -639,7 +639,7 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
     ask_yes_or_no => sub {
 	my ($_title, $msg) = @_; # graphical title
 	my $yesexpr = N("Yy");
-	$force || message_input_($msg, boolean => 1) =~ /[$yesexpr]/;
+	$force || message_input_($msg . N(" (y/N) "), boolean => 1) =~ /[$yesexpr]/;
     },
     need_restart => sub {
 	my ($need_restart_formatted) = @_;