X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=73f88ac6bee72fd0eabc3497881cf42e3392cc97;hp=52d6ba70af7a8401db7311ca89a66406de4b34a1;hb=678fb3c2ba03a4a284620c039717c0d94dd6106a;hpb=b4d127cb83230fe5cee0dcecb573107ad96a7c4c diff --git a/script/public-inbox-index b/script/public-inbox-index index 52d6ba70..73f88ac6 100755 --- a/script/public-inbox-index +++ b/script/public-inbox-index @@ -23,12 +23,12 @@ if ($@) { } my $reindex; -my $regen; +my $prune; my $jobs = undef; my %opts = ( '--reindex' => \$reindex, - '--regenerate' => \$regen, '--jobs|j=i' => \$jobs, + '--prune' => \$prune, ); GetOptions(%opts) or die "bad command-line args\n$usage"; die "--jobs must be positive\n" if defined $jobs && $jobs <= 0; @@ -115,16 +115,7 @@ sub index_dir { } } } - my $mm = $repo->mm; - my (undef, $max) = $mm->minmax if $mm; - if (defined($max) && !$reindex && !$regen) { - die -"v2 inboxes may only use --reindex and/or --regenerate once\n". -"msgmap.sqlite3 is initialized\n"; - } - - $v2w->reindex($regen); - $v2w->done; + $v2w->index_sync({ reindex => $reindex, prune => $prune }); } else { my $s = PublicInbox::SearchIdx->new($repo, 1); $s->index_sync({ reindex => $reindex });