summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD/Add.pm
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2011-09-17 15:33:57 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2011-09-17 15:33:57 +0000
commit14f8dea9175f3a4d60b75f5bd28945ce2ef321b3 (patch)
tree54a021d22afa453d14edcd31ccb1358d43239566 /usr.sbin/pkg_add/OpenBSD/Add.pm
parent0dfa92616ec7892ce1d1e19ba6849357b0c550e7 (diff)
make pkg_add -nvv work with respect to whatis.db updates;
ok espie@
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Add.pm')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Add.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 499c67a7b5d..0a9315bd53d 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.125 2011/08/23 10:32:27 espie Exp $
+# $OpenBSD: Add.pm,v 1.126 2011/09/17 15:33:56 schwarze Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -36,7 +36,8 @@ sub manpages_index
my @l = map { $destdir.$_ } @$v;
if ($state->{not}) {
$state->say("Merging manpages in #1: #2",
- $destdir.$k, join(@l)) if $state->verbose >= 2;
+ $destdir.$k, join(' ', @l))
+ if $state->verbose >= 2;
} else {
try {
OpenBSD::Makewhatis::merge($destdir.$k, \@l,
@@ -571,7 +572,7 @@ sub install
{
my ($self, $state) = @_;
$self->SUPER::install($state);
- $self->register_manpage($state) unless $state->{not};
+ $self->register_manpage($state);
}
package OpenBSD::PackingElement::InfoFile;