aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-10-27 12:49:51 +0000
committerThierry Vignaud <tv@mandriva.org>2006-10-27 12:49:51 +0000
commitf09c260538b9522a492d8c0be7631971881221b8 (patch)
tree2de700ee72bbaecf11604332bb5a0be05404b700
parent161a8e5d0a02bf53d021ab71e2598f8115c32bac (diff)
downloadrpmdrake-f09c260538b9522a492d8c0be7631971881221b8.tar
rpmdrake-f09c260538b9522a492d8c0be7631971881221b8.tar.gz
rpmdrake-f09c260538b9522a492d8c0be7631971881221b8.tar.bz2
rpmdrake-f09c260538b9522a492d8c0be7631971881221b8.tar.xz
rpmdrake-f09c260538b9522a492d8c0be7631971881221b8.zip
(perform_installation) better confirmation string when only removing packages (#26789)
-rwxr-xr-xrpmdrake6
1 files changed, 4 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 85973ec8..0fc86873 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1867,11 +1867,13 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $to_install = $install_count ? N("To satisfy dependencies, the following %d packages are going to be installed:\n%s\n", $install_count,
formatlistpkg(map { s!.*/!!; $_ } @pkgs)) : '';
interactive_msg_(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
- ($r ? N("The following packages have to be removed for others to be upgraded:
+ ($r ?
+ (!$to_install ? join("\n\n", N("Remove %d packages?", scalar(@to_remove)), $r) :
+ N("The following packages have to be removed for others to be upgraded:
%s
-Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install))) : $to_install),
+Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install)))) : $to_install),
scroll => 1,
yesno => 1) or do {
$w->{rwindow}->set_sensitive(1);