diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-11-11 10:47:27 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-11-11 10:47:27 +0000 |
| commit | e31ed5bb4cbddf2694888868ba2244110075a89c (patch) | |
| tree | 963bc8b1741b21095f016b51e2e5b09b8c8e3cb5 /usr.sbin/pkg_add/pkg_delete | |
| parent | cf72d011f419c95af087023e65a21266372e8cc1 (diff) | |
fix interaction of -n -v -r.
don't enable the progress meter if a very verbose mode is on.
Diffstat (limited to 'usr.sbin/pkg_add/pkg_delete')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete index 6f6e0496347..2e4eb435780 100644 --- a/usr.sbin/pkg_add/pkg_delete +++ b/usr.sbin/pkg_add/pkg_delete @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_delete,v 1.69 2004/11/09 11:11:01 espie Exp $ +# $OpenBSD: pkg_delete,v 1.70 2004/11/11 10:47:26 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -54,9 +54,6 @@ if (defined $opt_d) { Fatal "Option d is obsolete"; } -if ($opt_x) { - OpenBSD::ProgressMeter::enable(); -} if ($opt_f) { %forced = map {($_, 1)} split(/,/, $opt_f); } @@ -78,6 +75,10 @@ $state->{extra} = $opt_c; $state->{dont_run_scripts} = $opt_I; $ENV{'PKG_DELETE_EXTRA'} = $state->{extra} ? "Yes" : "No"; +if ($opt_x && $state->{beverbose}) { + OpenBSD::ProgressMeter::enable(); +} + # First, resolve pkg names my @realnames; |