From f15b9910503bc8223f6b4eda600f9a4822cd2126 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 24 Apr 2003 10:06:40 +0000
Subject: 4.3-7mdk

---
 urpm.pm    | 2 +-
 urpme      | 7 ++++++-
 urpmi.spec | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/urpm.pm b/urpm.pm
index dca1b418..5fc26a97 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -223,7 +223,7 @@ sub sync_curl {
 	open CURL, join(" ", map { "'$_'" } "/usr/bin/curl",
 			(ref($options) && $options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()),
 			(ref($options) && $options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()) .
-			"-s", "-I", @ftp_files) . " |";
+			"--stderr", "-", "-s", "-I", @ftp_files) . " |";
 	while (<CURL>) {
 	    if (/Content-Length:\s*(\d+)/) {
 		!$cur_ftp_file || exists($ftp_files_info{$cur_ftp_file}{size}) and $cur_ftp_file = shift @ftp_files;
diff --git a/urpme b/urpme
index 6c914d71..1a7f0356 100644
--- a/urpme
+++ b/urpme
@@ -25,7 +25,7 @@ use URPM;
 use URPM::Resolve;
 use urpm;
 
-my (@nextargv, $root, $test, $parallel, $auto, $matches, $maymatch, @l);
+my (@nextargv, $root, $test, $parallel, $auto, $matches, $verbose, $maymatch, @l);
 my $askok = N("Is this OK?");
 # Translator: Add here the keys which might be pressed in the "No"-case.
 my $noexpr = N("Nn");
@@ -42,6 +42,7 @@ usage:
 ") . N("  --auto         - automatically select a package in choices.
 ") . N("  --test         - verify if the installation can be achieved correctly.
 ") . N("  --parallel     - distributed urpmi accross machines of alias.
+") . N("  -v             - verbose mode.
 ") . N("  -a             - select all packages matching expression.
 ");
     exit(0);
@@ -58,6 +59,7 @@ while (defined($_ = shift @ARGV)) {
     /^-(.*)$/ and do { foreach (split //, $1) {
 	/[\?h]/ and do { usage; next };
 	/a/ and do { $matches = 1; next };
+	/v/ and do { $verbose = 1; next };
 	die N("urpme: unknown option \"-%s\", check usage with --help\n", $1); } next };
     @nextargv and do { my $r = shift @nextargv; $r and $$r = $_; next };
     push @l, $_;
@@ -66,6 +68,9 @@ while (defined($_ = shift @ARGV)) {
 my $urpm = new urpm;
 my $state = {};
 
+#- remove verbose if not asked.
+$verbose or $urpm->{log} = sub {};
+
 #- just configure parallel mode if available.
 $parallel and $urpm->configure(synthesis => 'none',
 			       root => $root,
diff --git a/urpmi.spec b/urpmi.spec
index cb9dbcd6..6d331e77 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.3
-Release: 6mdk
+Release: 7mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -199,7 +199,9 @@ $urpm->update_media;
 
 
 %changelog
-
+* Thu Apr 24 2003 François Pons <fpons@mandrakesoft.com> 4.3-7mdk
+- added -v to urpme and removed default log.
+- avoid curl output to be seen.
 - make require of Date::Manip optional (urpmi manage to continue
   evan if Date::Manip is not there of fail due to unknown TZ).
 
-- 
cgit v1.2.1