summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-21 16:14:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-21 16:14:47 +0000
commit4d4f0f02bdb78f485e0735e591b98204e6fe8d11 (patch)
treeabf5938421a8ff463e82fc7ab7935e73893e3fdd /urpm
parent6ffd2ff6b392f6930ee580c2984f56cdaa5f0e59 (diff)
downloadurpmi-4d4f0f02bdb78f485e0735e591b98204e6fe8d11.tar
urpmi-4d4f0f02bdb78f485e0735e591b98204e6fe8d11.tar.gz
urpmi-4d4f0f02bdb78f485e0735e591b98204e6fe8d11.tar.bz2
urpmi-4d4f0f02bdb78f485e0735e591b98204e6fe8d11.tar.xz
urpmi-4d4f0f02bdb78f485e0735e591b98204e6fe8d11.zip
do not call {ask_yes_or_no} callback with explicit "(y/N)" otherwise it is
displayed in GUIs (gurpmi/rpmdrake/...)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/main_loop.pm8
1 files changed, 4 insertions, 4 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;