From 89ea15bf14b7cc5298d21a414d268f69e648fe07 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 1 Aug 2007 15:14:19 +0000
Subject: - normalize verbose option handling over $options{verbose} - handle
 $rpm_opt where it is used

---
 urpmf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'urpmf')

diff --git a/urpmf b/urpmf
index 5b61b775..fd67412b 100755
--- a/urpmf
+++ b/urpmf
@@ -98,7 +98,6 @@ our $sortmedia = '';
 our $synthesis = '';
 our $uniq = '';		# --uniq
 our $update = 0;	# --update
-our $verbose = 0;	# --verbose
 
 #- globals used in callback
 our $expr;		# regexp to match against
@@ -121,7 +120,7 @@ if ($full) { $qf =~ s/%name\b/%fullname/ }
 
 #- we really don't want logs on stdout, and remove verbose if not asked.
 $urpm->{info} = sub { print STDERR "$_[0]\n" };
-$urpm->{log} = $verbose ? sub { print STDERR "$_[0]\n" } : sub {};
+$urpm->{log} = $options{verbose} ? sub { print STDERR "$_[0]\n" } : sub {};
 
 my $multitag = '';
 my %multitags = map { $_ => 1 } qw(conffiles conflicts files obsoletes provides requires);
-- 
cgit v1.2.1