aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/pkg.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-20 10:20:27 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-20 10:20:27 +0000
commit7a2a46f8579b45aad9b9630fa7ef3c039820e003 (patch)
tree7986294e8530349ea9d2713900f8e95f7a256d5d /Rpmdrake/pkg.pm
parent8b6ac903f78d72089f910284e0d3f625d1932219 (diff)
downloadrpmdrake-7a2a46f8579b45aad9b9630fa7ef3c039820e003.tar
rpmdrake-7a2a46f8579b45aad9b9630fa7ef3c039820e003.tar.gz
rpmdrake-7a2a46f8579b45aad9b9630fa7ef3c039820e003.tar.bz2
rpmdrake-7a2a46f8579b45aad9b9630fa7ef3c039820e003.tar.xz
rpmdrake-7a2a46f8579b45aad9b9630fa7ef3c039820e003.zip
(perform_installation) better formatting
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rw-r--r--Rpmdrake/pkg.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index c82b727a..760d907e 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -540,11 +540,12 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
. "\n" . formatlistpkg(map { s!.*/!!; $_ } @pkgs) . "\n");
my $remove_count = scalar(@to_remove);
interactive_msg(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
+ join("\n\n",
($r ?
- (!$to_install ? join("\n\n", P("Remove one package?", "Remove %d packages?", $remove_count, $remove_count), $r) :
- ($remove_count == 1 ?
+ (!$to_install ? (P("Remove one package?", "Remove %d packages?", $remove_count, $remove_count), $r) :
+ (($remove_count == 1 ?
N("The following package has to be removed for others to be upgraded:")
- : N("The following packages have to be removed for others to be upgraded:")) . join("\n\n", '', $r, if_($to_install, $to_install)))
+ : N("The following packages have to be removed for others to be upgraded:")), $r), if_($to_install, $to_install))
: $to_install),
N("Is it ok to continue?")),
scroll => 1,