treewide: shorten temporary filename

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

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index cbd4f003c6581d7121ead99be8b122e05ed25a0c..0461257feb7b483329d09f4b0e5e75f9b5913b0d 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -660,7 +660,7 @@ sub done {
 
 sub write_alternates ($$$) {
        my ($info_dir, $mode, $out) = @_;
-       my $fh = File::Temp->new(TEMPLATE => 'alt-XXXXXXXX', DIR => $info_dir);
+       my $fh = File::Temp->new(TEMPLATE => 'alt-XXXX', DIR => $info_dir);
        my $tmp = $fh->filename;
        print $fh @$out or die "print $tmp: $!\n";
        chmod($mode, $fh) or die "fchmod $tmp: $!\n";
@@ -772,11 +772,11 @@ sub import_init {
 sub diff ($$$) {
        my ($mid, $cur, $new) = @_;
 
-       my $ah = File::Temp->new(TEMPLATE => 'email-cur-XXXXXXXX', TMPDIR => 1);
+       my $ah = File::Temp->new(TEMPLATE => 'email-cur-XXXX', TMPDIR => 1);
        print $ah $cur->as_string or die "print: $!";
        $ah->flush or die "flush: $!";
        PublicInbox::Import::drop_unwanted_headers($new);
-       my $bh = File::Temp->new(TEMPLATE => 'email-new-XXXXXXXX', TMPDIR => 1);
+       my $bh = File::Temp->new(TEMPLATE => 'email-new-XXXX', TMPDIR => 1);
        print $bh $new->as_string or die "print: $!";
        $bh->flush or die "flush: $!";
        my $cmd = [ qw(diff -u), $ah->filename, $bh->filename ];
@@ -1216,7 +1216,7 @@ sub sync_ranges ($$) {
 
 sub index_xap_only { # git->cat_async callback
        my ($bref, $oid, $type, $size, $smsg) = @_;
-       my $self = $smsg->{self};
+       my $self = delete $smsg->{self};
        my $idx = idx_shard($self, $smsg->{num});
        $idx->index_eml(PublicInbox::Eml->new($bref), $smsg);
        $self->{transact_bytes} += $smsg->{bytes};
@@ -1323,6 +1323,7 @@ sub xapian_only {
                }
        }
        $self->git->cat_async_wait;
+       $self->{ibx}->cleanup;
        $self->done;
 }