4.3-5mdk

5 files changed, 40 insertions, 20 deletions

diff --git a/urpm.pm b/urpm.pm
index 0eed7a90..c54ed9cf 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -196,7 +196,7 @@ sub sync_wget {
 		    }
 		}
 	    } else {
-		print STDERR $_;
+		print STDERR $buf;
 	    }
 	    $buf = '';
 	}
@@ -284,7 +284,7 @@ sub sync_curl {
 			}
 		    }
 		} else {
-		    print STDERR $_;
+		    print STDERR $buf;
 		}
 		$buf = '';
 	    }
@@ -323,7 +323,7 @@ sub sync_rsync {
 			    propagate_sync_callback($options, 'progress', $file, $percent, undef, undef, $speed);
 			}
 		    } else {
-			print STDERR $_;
+			print STDERR $buf;
 		    }
 		    $buf = '';
 		}
@@ -365,7 +365,7 @@ sub sync_ssh {
 			    propagate_sync_callback($options, 'progress', $file, $percent, undef, undef, $speed);
 			}
 		    } else {
-			print STDERR $_;
+			print STDERR $buf;
 		    }
 		    $buf = '';
 		}
@@ -1317,6 +1317,7 @@ sub update_media {
 			      reduce_pathname("$medium->{url}/../descriptions"));
 		$urpm->{log}(N("...retrieving done"));
 	    };
+	    $@ and $urpm->{log}(N("...retrieving failed: %s", $@));
 	    if (-e "$urpm->{cachedir}/partial/descriptions") {
 		rename("$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}") or
 		  system("mv", "$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}");
@@ -1467,7 +1468,7 @@ sub update_media {
 	    if (-s "$urpm->{cachedir}/partial/$basename" > 32 && $retrieved_md5sum) {
 		$urpm->{log}(N("computing md5sum of retrieved source hdlist (or synthesis)"));
 		unless ((split ' ', `md5sum '$urpm->{cachedir}/partial/$basename'`)[0] eq $retrieved_md5sum) {
-		    $urpm->{log}(N("...retrieving failed: %s", $@));
+		    $urpm->{log}(N("...retrieving failed: %s", N("md5sum mismatch")));
 		    unlink "$urpm->{cachedir}/partial/$basename";
 		}
 	    }
diff --git a/urpmi.removemedia b/urpmi.removemedia
index 5ed4717f..82fac4f7 100755
--- a/urpmi.removemedia
+++ b/urpmi.removemedia
@@ -33,7 +33,7 @@ where <name> is a medium name to remove.
 ") . N("  --help         - print this help message.
 ") . N("  -a             - select all media.
 ") . N("  -c             - clean headers cache directory.
-") . (/^--?h(?:elp)$/ ? N("\nunknown options '%s'\n", $_) : '');
+") . (/^--?h(?:elp)$/ ? '' : N("\nunknown options '%s'\n", $_));
 	push @toremoves, $_;
     }
 
diff --git a/urpmi.spec b/urpmi.spec
index 039d1e99..5be5820c 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,14 +2,14 @@
 
 Name: urpmi
 Version: 4.3
-Release: 4mdk
+Release: 5mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
 Summary: User mode rpm install
 URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi
 Requires: eject webfetch perl-DateManip >= 5.40 gnupg
-PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.82-2mdk
+PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.82-3mdk
 BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3 perl-MDK-Common-devel
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildArch: noarch
@@ -199,6 +199,13 @@ $urpm->update_media;
 
 
 %changelog
+* Tue Apr 22 2003 François Pons <fpons@mandrakesoft.com> 4.3-5mdk
+- improved output of urpmq -i (with packager, buildhost and url).
+- fixed output of download informations (without callback).
+- fixed error message of urpmi.update and urpmi.removemedia when
+  using -h or --help.
+- fixed urpmq -i to work on all choices instead of the first one.
+
 * Fri Apr 18 2003 François Pons <fpons@mandrakesoft.com> 4.3-4mdk
 - added urpmq -i (the almost same as rpm -qi).
 
diff --git a/urpmi.update b/urpmi.update
index 3f5093a2..052f21c9 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -69,7 +69,7 @@ where <name> is a medium name to update.
 ") . N("  -c             - clean headers cache directory.
 ") . N("  -d             - force complete computation of depslist.ordered file.
 ") . N("  -f             - force generation of hdlist files.
-") . (/^--?h(?:elp)$/ ? N("\nunknown options '%s'\n", $_) : '');
+") . (/^--?h(?:elp)$/ ? '' : N("\nunknown options '%s'\n", $_));
 	push @toupdates, $_;
     }
 
diff --git a/urpmq b/urpmq
index f8b68455..6a5a4f21 100755
--- a/urpmq
+++ b/urpmq
@@ -338,17 +338,29 @@ if ($query->{list_aliases}) {
 		}
 	    }
 	    foreach (keys %{$state->{selected}}) {
-		my $pkg = $urpm->{depslist}[$_] or next;
-		my $file = $local_sources->{$_} || $downloads{$_} || "$urpm->{cachedir}/headers/".$pkg->header_filename;
-		$pkg->update_header($file, 0, 1);
-		printf "%-12s: %s\n", "Name", $pkg->name;
-		printf "%-12s: %s\n", "Version", $pkg->version;
-		printf "%-12s: %s\n", "Release", $pkg->release;
-		printf "%-12s: %s\n", "Group", $pkg->group;
-		$pkg->sourcerpm and printf "%-12s: %s\n", "Source RPM", $pkg->sourcerpm;
-		printf "%-12s: %-28s %12s: %s\n", "Size", $pkg->size, "Architecture", $pkg->arch;
-		$pkg->summary and printf "%-12s: %s\n", "Summary", $pkg->summary;
-		$pkg->description and printf "%-12s:\n%s\n", "Description", $pkg->description;
+		foreach (split /\|/, $_) {
+		    my $pkg = $urpm->{depslist}[$_] or next;
+		    my $file = $local_sources->{$_} || $downloads{$_} || "$urpm->{cachedir}/headers/".$pkg->header_filename;
+		    $pkg->update_header($file, 0, 1);
+		    printf "%-12s: %s\n", "Name", $pkg->name;
+		    printf "%-12s: %s\n", "Version", $pkg->version;
+		    printf "%-12s: %s\n", "Release", $pkg->release;
+		    printf "%-12s: %s\n", "Group", $pkg->group;
+		    printf "%-12s: %-28s %12s: %s\n", "Size", $pkg->size, "Architecture", $pkg->arch;
+		    if ($pkg->sourcerpm || $pkg->buildhost) {
+			if ($pkg->sourcerpm && $pkg->buildhost) {
+			    printf "%-12s: %-28s %12s: %s\n", "Source RPM", $pkg->sourcerpm, "Build Host", $pkg->buildhost;
+			} elsif ($pkg->sourcerpm) {
+			    $pkg->sourcerpm and printf "%-12s: %s\n", "Source RPM", $pkg->sourcerpm;
+			} else {
+			    $pkg->sourcerpm and printf "%-12s: %s\n", "Build Host", $pkg->buildhost;
+			}
+		    }
+		    $pkg->packager and printf "%-12s: %s\n", "Packager", $pkg->packager;
+		    $pkg->url and printf "%-12s: %s\n", "URL", $pkg->url;
+		    $pkg->summary and printf "%-12s: %s\n", "Summary", $pkg->summary;
+		    $pkg->description and printf "%-12s:\n%s\n", "Description", $pkg->description;
+		}
 	    }
 	} elsif ($query->{sources}) {
 	    print join "\n", values %$local_sources; values %$local_sources and print "\n";