From f09c260538b9522a492d8c0be7631971881221b8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 27 Oct 2006 12:49:51 +0000 Subject: (perform_installation) better confirmation string when only removing packages (#26789) --- rpmdrake | 6 ++++-- 1 file 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); -- cgit v1.2.1