No ext_urls

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 2534958b121e691ecee1e963fde736d03383c30f..11ea8f8307c2082ec974d51763df3f5f2983fa8c 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -198,8 +198,7 @@ sub resolve_inboxes ($;$$) {
        $opt->{-eidx_ok} ? (\@ibxs, \@eidx) : @ibxs;
 }
 
-# TODO: make Devel::Peek optional, only used for daemon
-my @base_mod = qw(Devel::Peek);
+my @base_mod = ();
 my @over_mod = qw(DBD::SQLite DBI);
 my %mod_groups = (
        -index => [ @base_mod, @over_mod ],
@@ -274,7 +273,7 @@ sub index_inbox {
        if (my $pr = $opt->{-progress}) {
                $pr->("indexing $ibx->{inboxdir} ...\n");
        }
-       local %SIG = %SIG;
+       local @SIG{keys %SIG} = values %SIG;
        setup_signals(\&index_terminate, $ibx);
        my $idx = { current_info => $ibx->{inboxdir} };
        local $SIG{__WARN__} = sub {
@@ -321,7 +320,7 @@ sub progress_prepare ($;$) {
        } else {
                $opt->{verbose} ||= 1;
                $dst //= *STDERR{GLOB};
-               $opt->{-progress} = sub { print $dst @_ };
+               $opt->{-progress} = sub { print $dst '# ', @_ };
        }
 }
 
@@ -369,7 +368,19 @@ sub index_prepare ($$) {
                                        or die "`$git_key=$s' not boolean\n";
                $opt->{$k} = $v;
        }
+       for my $k (qw(since until)) {
+               my $v = $opt->{$k} // next;
+               $opt->{reindex} or die "--$k=$v requires --reindex\n";
+       }
        $env;
 }
 
+sub do_chdir ($) {
+       my $chdir = $_[0] // return;
+       for my $d (@$chdir) {
+               next if $d eq ''; # same as git(1)
+               chdir $d or die "cd $d: $!";
+       }
+}
+
 1;