summaryrefslogtreecommitdiffstats
path: root/urpme
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-01 15:14:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-01 15:14:19 +0000
commit89ea15bf14b7cc5298d21a414d268f69e648fe07 (patch)
tree597b300a37ffc16d1cde43669827515e11cbb649 /urpme
parent2006fe16a22483e438ddf3793bf05c9133cdd36a (diff)
downloadurpmi-89ea15bf14b7cc5298d21a414d268f69e648fe07.tar
urpmi-89ea15bf14b7cc5298d21a414d268f69e648fe07.tar.gz
urpmi-89ea15bf14b7cc5298d21a414d268f69e648fe07.tar.bz2
urpmi-89ea15bf14b7cc5298d21a414d268f69e648fe07.tar.xz
urpmi-89ea15bf14b7cc5298d21a414d268f69e648fe07.zip
- normalize verbose option handling over $options{verbose}
- handle $rpm_opt where it is used
Diffstat (limited to 'urpme')
-rw-r--r--urpme4
1 files changed, 2 insertions, 2 deletions
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"));