treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / scripts / import_vger_from_mbox

diff --git a/scripts/import_vger_from_mbox b/scripts/import_vger_from_mbox
index 369dac79824a30b73a5d6cac836c3194f17f946e..0e5ba6b47b73fc0994f99f1dab6669329d74cd28 100644 (file)
--- a/scripts/import_vger_from_mbox
+++ b/scripts/import_vger_from_mbox
@@ -1,12 +1,11 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
 use PublicInbox::MIME;
 use PublicInbox::InboxWritable;
-use PublicInbox::V2Writable;
 use PublicInbox::Import;
 use PublicInbox::MDA;
 my $usage = "usage: $0 NAME EMAIL DIR <MBOX\n";
@@ -24,20 +23,21 @@ if ($variant ne 'mboxrd' && $variant ne 'mboxo') {
 }
 my $name = shift or die $usage; # git
 my $email = shift or die $usage; # git@vger.kernel.org
-my $mainrepo = shift or die $usage; # /path/to/v2/repo
+my $inboxdir = shift or die $usage; # /path/to/v2/repo
 my $ibx = {
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => $name,
        version => $version,
-       -primary_address => $email,
+       address => [ $email ],
        filter => 'PublicInbox::Filter::Vger',
 };
 $ibx = PublicInbox::Inbox->new($ibx);
 unless ($dry_run) {
        if ($version >= 2) {
+               require PublicInbox::V2Writable;
                PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
        } else {
-               system(qw(git init --bare -q), $mainrepo) == 0 or die;
+               system(qw(git init --bare -q), $inboxdir) == 0 or die;
        }
 }
 $ibx = PublicInbox::InboxWritable->new($ibx);