summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-25 12:20:44 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-25 12:20:44 +0000
commit082a2550f00d0d21e63983944be159c412f05f88 (patch)
tree1600b3cf9eb159f801fac869a81d5799a1d419a7
parent403d0c7d50400e63d58bf74ab29d1a118ae05249 (diff)
downloadurpmi-082a2550f00d0d21e63983944be159c412f05f88.tar
urpmi-082a2550f00d0d21e63983944be159c412f05f88.tar.gz
urpmi-082a2550f00d0d21e63983944be159c412f05f88.tar.bz2
urpmi-082a2550f00d0d21e63983944be159c412f05f88.tar.xz
urpmi-082a2550f00d0d21e63983944be159c412f05f88.zip
(run) kill 'bad_rpms' & 'missing_files_summary' callbacks, reusing
existing unused 'message' callback
-rw-r--r--NEWS1
-rw-r--r--urpm/main_loop.pm14
2 files changed, 7 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index b4382514..cbba6765 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@
download dir to cachedir)
- urpmi:
o do not say "files are missing" when the downloaded rpm is corrupted
- (rpmdrake must add a "bad_rpms" callback to display the new message)
Version 5.5 - 23 February 2008, by Pascal "Pixel" Rigaux
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 0b93be47..dfd1fd49 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -253,16 +253,16 @@ $callbacks->{completed} and $callbacks->{completed}->();
#- keep a track of error code.
my $exit_code = 0;
if (my @missing = grep { $error_sources{$_} eq 'missing' } keys %error_sources) {
- $callbacks->{missing_files_summary} and $callbacks->{missing_files_summary}->({ map { $_ => $_ } @missing });
- #- Warning : the following message is parsed in urpm::parallel_*
- print N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database",
- join "\n", map { " " . urpm::download::hide_password($_) } @missing), "\n";
+ $callbacks->{message}->(N("Error"),
+ #- Warning : the following message is parsed in urpm::parallel_*
+ N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database",
+ join "\n", map { " " . urpm::download::hide_password($_) } @missing) . "\n"
+ );
$exit_code = 10;
}
if (my @bad = grep { $error_sources{$_} eq 'bad' } keys %error_sources) {
- $callbacks->{bad_rpms} and $callbacks->{bad_rpms}->(@bad);
- print N("Installation failed, bad rpms:\n%s",
- join "\n", map { " " . urpm::download::hide_password($_) } @bad), "\n";
+ $callbacks->{message}->(N("Error"), N("Installation failed, bad rpms:\n%s",
+ join "\n", map { " " . urpm::download::hide_password($_) } @bad), "\n");
$exit_code = 11;
}
if ($nok) {