summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-15 16:23:00 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-15 16:23:00 +0000
commitd01984d41885faec823fc6c562e3f70bf60ecc03 (patch)
treec3b0fb3a58d841cccfb9caa9a143a1569b8e0774
parentdb273a75016fa95cc27cd41d7abea67a6476653c (diff)
downloadurpmi-d01984d41885faec823fc6c562e3f70bf60ecc03.tar
urpmi-d01984d41885faec823fc6c562e3f70bf60ecc03.tar.gz
urpmi-d01984d41885faec823fc6c562e3f70bf60ecc03.tar.bz2
urpmi-d01984d41885faec823fc6c562e3f70bf60ecc03.tar.xz
urpmi-d01984d41885faec823fc6c562e3f70bf60ecc03.zip
(configure_urpm,do_install_3) display all urpmi logs
-rw-r--r--NEWS3
-rwxr-xr-xgurpmi25
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index a6fa75f0..57163702 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- gurpmi
+ o display all urpmi logs
+
Version 6.14.5 - 15 October 2008
- urpmi
diff --git a/gurpmi2 b/gurpmi2
index 5876718d..51db1e34 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -127,12 +127,15 @@ sub configure_urpm() {
}
$urpm->{fatal} = sub {
+ printf STDERR "%s\n", $_[1];
Gtk2::MessageDialog->new($mainw, [qw(modal destroy-with-parent)], 'error', 'ok', Locale::gettext::iconv($_[1], undef, 'UTF-8'))->run;
quit();
exit $_[0];
};
+ $urpm->{log} = sub { printf "%s\n", $_[0] };
$urpm->{error} = sub {
my ($message) = @_;
+ printf STDERR "%s\n", $message;
my $nb_lines = $message =~ tr/\n/\n/;
my $w;
if ($nb_lines > 30) {
@@ -320,6 +323,8 @@ sub do_install_3 () {
trans_log => sub {
my ($mode, $file, $percent, $total, $eta, $speed) = @_;
+ urpm::download::sync_logger(@_);
+
if (member($mode, 'start', 'progress')) {
$file =~ s|/*\s*$||; $file =~ s|.*/||;
$progress_label->set_label(N("Downloading package `%s'...", $file) . "\n" . &urpm::download::progress_text);