diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-20 12:16:52 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-20 12:16:52 +0000 |
commit | 58752baf6c05162c1e86192572fb1b9df4719351 (patch) | |
tree | 739f8459eaf5ed5cbc705833dd2a21812194c21d /usr.sbin | |
parent | e8de82031dd4aac483f836ffa154d34049cebf32 (diff) |
don't display some details in -n mode unless very verbose.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 8 | ||||
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 10 | ||||
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 81218543211..511e9d4d1a1 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.28 2004/12/18 13:58:43 espie Exp $ +# $OpenBSD: Add.pm,v 1.29 2004/12/20 12:16:51 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -32,7 +32,7 @@ sub manpages_index while (my ($k, $v) = each %{$state->{mandirs}}) { my @l = map { $destdir.$_ } @$v; if ($state->{not}) { - print "Merging manpages in $destdir$k: ", join(@l), "\n"; + print "Merging manpages in $destdir$k: ", join(@l), "\n" if $state->{verbose}; } else { try { OpenBSD::Makewhatis::merge($destdir.$k, \@l); @@ -289,7 +289,7 @@ sub install if ($state->{replacing}) { if ($state->{not}) { - print "moving tempfile -> $destdir$fullname\n"; + print "moving tempfile -> $destdir$fullname\n" if $state->{very_verbose}; return; } File::Path::mkpath(dirname($destdir.$fullname)); @@ -306,7 +306,7 @@ sub install } else { my $file = $self->prepare_to_extract($state); - print "extracting $destdir$fullname\n" if $state->{beverbose}; + print "extracting $destdir$fullname\n" if $state->{very_verbose}; return if $state->{not}; $file->create(); } diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index c84c9029d3e..9a42a1c4736 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.17 2004/12/16 11:07:33 espie Exp $ +# $OpenBSD: Delete.pm,v 1.18 2004/12/20 12:16:51 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -32,7 +32,7 @@ sub manpages_unindex while (my ($k, $v) = each %{$state->{mandirs}}) { my @l = map { $destdir.$_ } @$v; if ($state->{not}) { - print "Removing manpages in $destdir$k: ", join(@l), "\n"; + print "Removing manpages in $destdir$k: ", join(@l), "\n" if $state->{verbose}; } else { eval { OpenBSD::Makewhatis::remove($destdir.$k, \@l); }; if ($@) { @@ -213,7 +213,7 @@ sub delete my $name = $self->fullname(); - if ($state->{beverbose}) { + if ($state->{very_verbose}) { print "dirrm: $name\n"; } @@ -249,7 +249,7 @@ sub delete } my $realname = $state->{destdir}.$name; if (-l $realname) { - if ($state->{beverbose}) { + if ($state->{very_verbose}) { print "deleting symlink: $realname\n"; } } else { @@ -272,7 +272,7 @@ sub delete return; } } - if ($state->{beverbose}) { + if ($state->{very_verbose}) { print "deleting: $realname\n"; } } diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index bd66cb05610..308143598e4 100644 --- a/usr.sbin/pkg_add/OpenBSD/Update.pm +++ b/usr.sbin/pkg_add/OpenBSD/Update.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Update.pm,v 1.44 2004/12/19 20:25:17 espie Exp $ +# $OpenBSD: Update.pm,v 1.45 2004/12/20 12:16:51 espie Exp $ # # Copyright (c) 2004 Marc Espie <espie@openbsd.org> # @@ -70,7 +70,7 @@ sub extract $d = dirname($d); } if ($state->{not}) { - print "extracting tempfile under $d\n"; + print "extracting tempfile under $d\n" if $state->{very_verbose}; } else { if (!-e _) { File::Path::mkpath($d); |