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

---
 urpme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'urpme')

diff --git a/urpme b/urpme
index 1d5989d1..1f30714b 100644
--- a/urpme
+++ b/urpme
@@ -31,7 +31,7 @@ use urpm::select;
 $ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
 delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
 
-our ($test, $parallel, $auto, $matches, $verbose, $force, $noscripts, $repackage, @l, $bundle, $restricted);
+our ($test, $parallel, $auto, $matches, $force, $noscripts, $repackage, @l, $bundle, $restricted);
 my $yesexpr =
   #-PO: Add here the keys which might be pressed in the "Yes"-case.
   N("Yy");
@@ -70,7 +70,7 @@ urpm::args::parse_cmdline(urpm => $urpm) or exit(1);
 my $state = {};
 
 #- remove verbose if not asked.
-$verbose or $urpm->{log} = sub {};
+$options{verbose} or $urpm->{log} = sub {};
 
 if ($< && !$test) {
     $urpm->{fatal}(1, N("Only superuser is allowed to remove packages"));
-- 
cgit v1.2.1