diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-01-16 08:42:39 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-01-16 08:42:39 +0000 |
| commit | 1a3f93b1d4b616d0b6c07d9f6c9fd75dcacbc94d (patch) | |
| tree | 1587f978ddba00406e4601468bf403df20d68046 /usr.sbin/pkg_add/OpenBSD/Add.pm | |
| parent | 81623f027f52045f8e009861921bdc48d230c7f0 (diff) | |
Backout activation of the new apropos(1)/whatis(1)/makewhatis(8).
In its current state, it causes too much slowdown, in particular
during system builds, and there are other regressions.
That cannot be fixed quickly while it's enabled.
Problems pointed out by espie@, backout requested by deraadt@,
diff "looks good" to espie@.
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", $_); + }; } } } |