X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FImport.pm;h=a901350402c50febdc73ea1afa37a5be1afc9490;hb=7bca96023bb26438a5c9d0a7eec3986f5d66f5bf;hp=792570c8f36586daf7f17febd825515518c84676;hpb=c43813b9138398ed2de06c3616a5932725090ae3;p=public-inbox.git diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index 792570c8..a9013504 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -160,7 +160,7 @@ sub progress { my ($self, $msg) = @_; return unless $self->{pid}; print { $self->{out} } "progress $msg\n" or wfail; - $self->{in}->getline eq "progress $msg\n" or die + readline($self->{in}) eq "progress $msg\n" or die "progress $msg not received\n"; undef; } @@ -554,7 +554,7 @@ sub replace_oids { push @buf, "reset $tmp\n"; } elsif (/^commit (?:.+)/) { if (@buf) { - $w->print(@buf) or wfail; + print $w @buf or wfail; @buf = (); } push @buf, "commit $tmp\n"; @@ -591,7 +591,7 @@ sub replace_oids { rewrite_commit($self, \@oids, \@buf, $mime); $nreplace++; } - $w->print(@buf, "\n") or wfail; + print $w @buf, "\n" or wfail; @buf = (); } elsif ($_ eq "done\n") { $done = 1; @@ -604,7 +604,7 @@ sub replace_oids { } close $rd or die "close fast-export failed: $?"; if (@buf) { - $w->print(@buf) or wfail; + print $w @buf or wfail; } die 'done\n not seen from fast-export' unless $done; chomp(my $cmt = $self->get_mark(":$mark")) if $nreplace;