aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-21 14:26:42 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-21 14:26:42 +0000
commit96f5322819c0ca5d5405a89315af19bca0649f61 (patch)
tree22d106a4fd60766906c80388716d4804cef2d0e7
parentaa40ddc296c709c7282b3be1c3ad0bb7d49105eb (diff)
downloadrpmdrake-96f5322819c0ca5d5405a89315af19bca0649f61.tar
rpmdrake-96f5322819c0ca5d5405a89315af19bca0649f61.tar.gz
rpmdrake-96f5322819c0ca5d5405a89315af19bca0649f61.tar.bz2
rpmdrake-96f5322819c0ca5d5405a89315af19bca0649f61.tar.xz
rpmdrake-96f5322819c0ca5d5405a89315af19bca0649f61.zip
(formatlistpkg) rename as format_list() (more consistent with other
function names)
-rw-r--r--Rpmdrake/formatting.pm4
-rw-r--r--Rpmdrake/gui.pm8
-rw-r--r--Rpmdrake/pkg.pm4
3 files changed, 8 insertions, 8 deletions
diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm
index 07ad40fc..b3e7eb5b 100644
--- a/Rpmdrake/formatting.pm
+++ b/Rpmdrake/formatting.pm
@@ -40,7 +40,7 @@ our @EXPORT = qw(
format_changelog_string
format_field
format_header
- formatlistpkg
+ format_list
format_name_n_summary
format_size
format_update_field
@@ -165,6 +165,6 @@ sub format_size {
N("%s of disk space will be freed.", formatXiB(-$size));
}
-sub formatlistpkg { join("\n", map { s/^(\s)/ $1/mg; "- $_" } sort { uc($a) cmp uc($b) } @_) }
+sub format_list { join("\n", map { s/^(\s)/ $1/mg; "- $_" } sort { uc($a) cmp uc($b) } @_) }
1;
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 3418d32c..63a8f0ff 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -540,7 +540,7 @@ sub deps_msg {
deps_msg_again:
my $results = interactive_msg(
$title, $msg .
- formatlistpkg(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @deps)
+ format_list(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @deps)
. "\n\n" . format_size($urpm->selected_size($urpm->{state})),
yesno => [ N("Cancel"), N("More info"), N("Ok") ],
scroll => 1,
@@ -593,7 +593,7 @@ sub toggle_nodes {
}
@impossible_to_remove and interactive_msg(N("Some packages can't be removed"),
N("Removing these packages would break your system, sorry:\n\n") .
- formatlistpkg(@impossible_to_remove));
+ format_list(@impossible_to_remove));
@nodes_with_deps = difference2(\@nodes_with_deps, \@impossible_to_remove);
} else {
slow_func($widget,
@@ -653,8 +653,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", formatlistpkg(@reasons))
- : N("Sorry, the following packages can't be selected:\n\n%s", formatlistpkg(@reasons))),
+ N("Sorry, the following package cannot be selected:\n\n%s", format_list(@reasons))
+ : N("Sorry, the following packages can't be selected:\n\n%s", format_list(@reasons))),
scroll => 1,
);
foreach (@cant) {
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index b95e7a68..70b04e14 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -598,13 +598,13 @@ 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 = formatlistpkg(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @to_remove);
+ my $r = format_list(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @to_remove);
my $size = $urpm->selected_size($state);
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\n" . formatlistpkg(map { s!.*/!!; $_ } @pkgs));
+ . "\n\n" . format_list(map { s!.*/!!; $_ } @pkgs));
my $remove_count = scalar(@to_remove);
interactive_msg(($to_install ? N("Confirmation") : N("Some packages need to be removed")),
join("\n\n",