From d01984d41885faec823fc6c562e3f70bf60ecc03 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 15 Oct 2008 16:23:00 +0000 Subject: (configure_urpm,do_install_3) display all urpmi logs --- NEWS | 3 +++ gurpmi2 | 5 +++++ 2 files changed, 8 insertions(+) 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); -- cgit v1.2.1