From 60a13fdee967a003e17a03a6e4978a57965ab419 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 1 Sep 2020 16:54:31 +0000 Subject: [PATCH] index: check for xapian-compact when using --compact Otherwise, users may be frustrated to discover it missing a long indexing run. --- script/public-inbox-index | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/public-inbox-index b/script/public-inbox-index index 9855c67d..cb11075e 100755 --- a/script/public-inbox-index +++ b/script/public-inbox-index @@ -66,10 +66,14 @@ foreach my $ibx (@ibxs) { PublicInbox::Admin::scan_ibx_modules($mods, $ibx); } +# "Search::Xapian" includes SWIG "Xapian", too: +$opt->{compact} = 0 if !$mods->{'Search::Xapian'}; + PublicInbox::Admin::require_or_die(keys %$mods); my $env = PublicInbox::Admin::index_prepare($opt, $cfg); local %ENV = (%ENV, %$env) if $env; require PublicInbox::InboxWritable; +PublicInbox::Xapcmd::check_compact() if $opt->{compact}; PublicInbox::Admin::progress_prepare($opt); for my $ibx (@ibxs) { $ibx = PublicInbox::InboxWritable->new($ibx); -- 2.44.0