No ext_urls

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index b58e26525fe858cb63079db6d64c7bca9f96785d..31eba794066a9871a9e6b80567f1e3c296d16650 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -150,8 +150,8 @@ sub git_to_mail { # git->cat_async callback
        $self->{lei}->fail("$@ (oid=$oid)") if $@;
 }
 
-sub reap_compress { # dwaitpid callback
-       my ($lei, $pid) = @_;
+sub reap_compress { # awaitpid callback
+       my ($pid, $lei) = @_;
        my $cmd = delete $lei->{"pid.$pid"};
        return if $? == 0;
        $lei->fail("@$cmd failed", $? >> 8);
@@ -652,9 +652,8 @@ sub _do_augment_mbox {
        $dedupe->pause_dedupe if $dedupe;
 }
 
-sub v2w_done_wait { # dwaitpid callback
-       my ($arg, $pid) = @_;
-       my ($v2w, $lei) = @$arg;
+sub v2w_done_wait { # awaitpid cb
+       my ($pid, $v2w, $lei) = @_;
        $lei->child_error($?, "error for $v2w->{ibx}->{inboxdir}") if $?;
 }
 
@@ -680,8 +679,8 @@ sub _pre_augment_v2 {
        PublicInbox::InboxWritable->new($ibx, @creat);
        $ibx->init_inbox if @creat;
        my $v2w = $ibx->importer;
-       $v2w->wq_workers_start("lei/v2w $dir", 1, $lei->oldset, {lei => $lei});
-       $v2w->wq_wait_async(\&v2w_done_wait, $lei);
+       $v2w->wq_workers_start("lei/v2w $dir", 1, $lei->oldset, {lei => $lei},
+                               \&v2w_done_wait, $lei);
        $lei->{v2w} = $v2w;
        return if !$lei->{opt}->{shared};
        my $d = "$lei->{ale}->{git}->{git_dir}/objects";