diff options
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Add.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index aa9c45222df..8c790f7cdd7 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.128 2012/01/05 23:03:57 schwarze Exp $ +# $OpenBSD: Add.pm,v 1.129 2012/01/16 08:42:38 schwarze Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -30,6 +30,7 @@ sub manpages_index my ($state) = @_; return unless defined $state->{mandirs}; my $destdir = $state->{destdir}; + require OpenBSD::Makewhatis; while (my ($k, $v) = each %{$state->{mandirs}}) { my @l = map { $destdir.$_ } @$v; @@ -38,8 +39,12 @@ sub manpages_index $destdir.$k, join(' ', @l)) if $state->verbose >= 2; } else { - $state->vsystem(OpenBSD::Paths->makewhatis, - '-d', $destdir.$k, '--', @l); + try { + OpenBSD::Makewhatis::merge($destdir.$k, \@l, + $state); + } catchall { + $state->errsay("Error in makewhatis: #1", $_); + }; } } } |