diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-01 15:14:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-01 15:14:19 +0000 |
| commit | 89ea15bf14b7cc5298d21a414d268f69e648fe07 (patch) | |
| tree | 597b300a37ffc16d1cde43669827515e11cbb649 /urpm | |
| parent | 2006fe16a22483e438ddf3793bf05c9133cdd36a (diff) | |
| download | urpmi-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 'urpm')
| -rw-r--r-- | urpm/args.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm/args.pm b/urpm/args.pm index ecca014f..be510c83 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -46,7 +46,7 @@ END { $::debug_exit and print STDERR "EXITING (pid=$$)\n" } my %options_spec_all = ( 'debug' => sub { $::debug_exit = 1; - $::verbose++; $options{verbose}++; + $options{verbose}++; $urpm->{debug} = $urpm->{debug_URPM} = sub { print STDERR "$_[0]\n" }; }, 'urpmi-root=s' => sub { urpm::set_files($urpm, $_[1]) }, @@ -152,8 +152,8 @@ my %options_spec = ( 'no-md5sum' => \$::nomd5sum, 'force-key' => \$::forcekey, a => \$::all, - 'q|quiet' => sub { --$::verbose; $::rpm_opt = '' }, - 'v|verbose' => sub { ++$::verbose; $::rpm_opt = 'vh' }, + 'q|quiet' => sub { --$options{verbose} }, + 'v|verbose' => sub { ++$options{verbose} }, p => sub { $::use_provides = 1 }, P => sub { $::use_provides = 0 }, y => sub { $urpm->{options}{fuzzy} = 1 }, @@ -162,7 +162,7 @@ my %options_spec = ( urpme => { auto => \$::auto, - 'v|verbose' => \$::verbose, + 'v|verbose' => \$options{verbose}, a => \$::matches, noscripts => \$::noscripts, repackage => \$::repackage, @@ -182,7 +182,7 @@ my %options_spec = ( }, 'qf=s' => \$::qf, 'uniq|u' => \$::uniq, - 'verbose|v' => \$::verbose, + 'verbose|v' => \$options{verbose}, m => add_param_closure('media'), i => sub { $::pattern = 'i' }, I => sub { $::pattern = '' }, |