aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-10 15:07:34 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-10 15:07:34 +0000
commitaa27ed8c0d2ff24a1289993076204d4cb7a1f60e (patch)
tree617a48c4f2626c78dcb4ed54cde8bd8999b28aba
parentc96ad4891f2c434bbab9008fd118670ad05a322d (diff)
downloadrpmdrake-aa27ed8c0d2ff24a1289993076204d4cb7a1f60e.tar
rpmdrake-aa27ed8c0d2ff24a1289993076204d4cb7a1f60e.tar.gz
rpmdrake-aa27ed8c0d2ff24a1289993076204d4cb7a1f60e.tar.bz2
rpmdrake-aa27ed8c0d2ff24a1289993076204d4cb7a1f60e.tar.xz
rpmdrake-aa27ed8c0d2ff24a1289993076204d4cb7a1f60e.zip
(deps_msg,perform_installation,toggle_nodes) use new formatlistpkg() for better rendering
-rw-r--r--Rpmdrake/gui.pm7
-rwxr-xr-xRpmdrake/pkg.pm4
2 files changed, 6 insertions, 5 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index ca77631b..c726ac0b 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -455,7 +455,8 @@ sub deps_msg {
@deps > 0 or return 1;
deps_msg_again:
my $results = interactive_msg(
- $title, $msg . urpm::select::translate_why_removed($urpm, $urpm->{state}, @deps),
+ $title, $msg .
+ formatlistpkg(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @deps),
yesno => [ N("Cancel"), N("More info"), N("Ok") ],
scroll => 1,
);
@@ -563,8 +564,8 @@ sub toggle_nodes {
interactive_msg(
($count == 1 ? N("One package cannot be installed") : N("Some packages can't be installed")),
($count == 1 ?
- N("Sorry, the following package cannot be selected:\n\n%s", join("\n", @reasons))
- : N("Sorry, the following packages can't be selected:\n\n%s", join("\n", @reasons))),
+ N("Sorry, the following package cannot be selected:\n\n%s", formatlistpkg(@reasons))
+ : N("Sorry, the following packages can't be selected:\n\n%s", formatlistpkg(@reasons))),
scroll => 1,
);
foreach (@cant) {
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 0aa9d32f..0ec4e735 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -548,12 +548,12 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
@{$urpm->{ask_remove}} = sort urpm::select::removed_packages($urpm, $urpm->{state});
my @to_remove = map { if_($pkgs->{$_}{selected} && !$pkgs->{$_}{pkg}->flag_upgrade, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
- my $r = join "\n", urpm::select::translate_why_removed($urpm, $urpm->{state}, @to_remove);
+ my $r = formatlistpkg(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @to_remove);
my $install_count = int(@pkgs);
my $to_install = $install_count == 0 ? '' :
( P("The following package is going to be installed:", "The following %d packages are going to be installed:", $install_count, $install_count)
- . "\n" . formatlistpkg(map { s!.*/!!; $_ } @pkgs) . "\n");
+ . "\n" . formatlistpkg(map { print ">> $_\n"; s!.*/!!; $_ } @pkgs) . "\n");
my $remove_count = scalar(@to_remove);
interactive_msg(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
($r ?