spawn: allow passing GLOB handles for redirects

[public-inbox.git] / lib / PublicInbox / Admin.pm

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index dddeeae94efc8763100b565e21f4d934d3eec5d4..5a3554cfe460c9efb8189f93422fc90a9a5efe9b 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -136,7 +136,7 @@ EOF
 }
 
 # TODO: make Devel::Peek optional, only used for daemon
-my @base_mod = qw(Email::MIME Date::Parse Devel::Peek);
+my @base_mod = qw(Email::MIME Devel::Peek);
 my @over_mod = qw(DBD::SQLite DBI);
 my %mod_groups = (
        -index => [ @base_mod, @over_mod ],
@@ -159,6 +159,10 @@ sub check_require {
        while (my $mod = shift @mods) {
                if (my $groups = $mod_groups{$mod}) {
                        push @mods, @$groups;
+               } elsif ($mod eq 'Search::Xapian') {
+                       require PublicInbox::Search;
+                       PublicInbox::Search::load_xapian() or
+                               $err->{'Search::Xapian || Xapian'} = $@;
                } else {
                        eval "require $mod";
                        $err->{$mod} = $@ if $@;
@@ -237,8 +241,7 @@ sub progress_prepare ($) {
        if ($opt->{quiet}) {
                open my $null, '>', '/dev/null' or
                        die "failed to open /dev/null: $!\n";
-               $opt->{1} = fileno($null); # suitable for spawn() redirect
-               $opt->{-dev_null} = $null;
+               $opt->{1} = $null; # suitable for spawn() redirect
        } else {
                $opt->{verbose} ||= 1;
                $opt->{-progress} = sub { print STDERR @_ };