X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-convert;h=e13c13f44153ed1f29082a10f80317c229574422;hb=0acad050fe38033baedfed83f5976aeabebf3287;hp=281313e02873fb7bd7aa27ba8fcc5dbd0e2c188f;hpb=2fef8c4500fc00a15b36552c2a22da1582af033d;p=public-inbox.git diff --git a/script/public-inbox-convert b/script/public-inbox-convert index 281313e0..e13c13f4 100755 --- a/script/public-inbox-convert +++ b/script/public-inbox-convert @@ -1,11 +1,12 @@ #!/usr/bin/perl -w -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); use PublicInbox::InboxWritable; use PublicInbox::Config; +use PublicInbox::Admin; use PublicInbox::V2Writable; use PublicInbox::Git; use PublicInbox::Spawn qw(spawn); @@ -45,6 +46,14 @@ $old = PublicInbox::InboxWritable->new($old); if ($old->version >= 2) { die "Only conversion from v1 inboxes is supported\n"; } + +$old->{indexlevel} //= PublicInbox::Admin::detect_indexlevel($old); +if ($index) { + my $mods = {}; + PublicInbox::Admin::scan_ibx_modules($mods, $old); + PublicInbox::Admin::require_or_die(keys %$mods); +} + my $new = { %$old }; $new->{inboxdir} = abs_path($new_dir); $new->{version} = 2; @@ -151,7 +160,5 @@ if (my $mm = $old->mm) { chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head)); $v2w->last_epoch_commit(0, $cmt); } -if ($index) { - $v2w->index_sync({reindex => 1}); - $v2w->done; -} +$v2w->index_sync({reindex => 1}) if $index; +$v2w->done;