- gurpmi

  o display the download errors

(backported from trunk)

2 files changed, 9 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 873af1cd..29a1b1b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
 Version 6.14.6 - 15 October 2008
 
 - gurpmi
-  o display all urpmi logs
+  o display the download errors
+  o log all urpmi logs
 
 Version 6.14.5 - 15 October 2008
 
diff --git a/gurpmi2 b/gurpmi2
index 51db1e34..a981363f 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -136,6 +136,10 @@ sub configure_urpm() {
     $urpm->{error} = sub {
 	my ($message) = @_;
 	printf STDERR "%s\n", $message;
+
+	if (my $download_errors = delete $urpm->{download_errors}) {
+	    $message = join("\n", @$download_errors, $message);
+	}
 	my $nb_lines = $message =~ tr/\n/\n/;
 	my $w;
 	if ($nb_lines > 30) {
@@ -337,6 +341,9 @@ sub do_install_3 () {
 		$set_progressbar->($percent / 100);
             } elsif ($mode eq 'end') {
 		$set_progressbar->(1);
+            } elsif ($mode eq 'error') {
+		#- error is 3rd argument, saved in $percent
+		push @{$urpm->{download_errors}}, N("...retrieving failed: %s", $percent);
             }
             sync();
         },