treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index c73910acb30a754329bf5ce58e998a8775642b3f..e684f5464167d2d25bf15b2dae0998d1d95fe2f7 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Extends read-only Inbox for writing
@@ -7,8 +7,7 @@ use strict;
 use warnings;
 use base qw(PublicInbox::Inbox);
 use PublicInbox::Import;
-use PublicInbox::Filter::Base;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
+use PublicInbox::Filter::Base qw(REJECT);
 
 use constant {
        PERM_UMASK => 0,
@@ -25,7 +24,7 @@ sub new {
        # TODO: maybe stop supporting this
        if ($creat_opt) { # for { nproc => $N }
                $self->{-creat_opt} = $creat_opt;
-               init_inbox($self) if ($self->{version} || 1) == 1;
+               init_inbox($self) if $self->version == 1;
        }
        $self;
 }
@@ -40,8 +39,7 @@ sub assert_usable_dir {
 sub init_inbox {
        my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
        # TODO: honor skip_artnum
-       my $v = $self->{version} || 1;
-       if ($v == 1) {
+       if ($self->version == 1) {
                my $dir = assert_usable_dir($self);
                PublicInbox::Import::init_bare($dir);
        } else {
@@ -52,7 +50,7 @@ sub init_inbox {
 
 sub importer {
        my ($self, $parallel) = @_;
-       my $v = $self->{version} || 1;
+       my $v = $self->version;
        if ($v == 2) {
                eval { require PublicInbox::V2Writable };
                die "v2 not supported: $@\n" if $@;
@@ -76,7 +74,7 @@ sub filter {
                # v2 keeps msgmap open, which causes conflicts for filters
                # such as PublicInbox::Filter::RubyLang which overload msgmap
                # for a predictable serial number.
-               if ($im && ($self->{version} || 1) >= 2 && $self->{altid}) {
+               if ($im && $self->version >= 2 && $self->{altid}) {
                        $im->done;
                }
 
@@ -257,4 +255,8 @@ sub umask_prepare {
        $self->{umask} = $umask;
 }
 
+sub cleanup ($) {
+       delete @{$_[0]}{qw(over mm git search)};
+}
+
 1;