X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiToMail.pm;h=da3a95d20d2e1869124f77d1e4b0f14b17d28ec6;hb=40f3f2a2c805fc37c7ed35a60948856bd962b493;hp=64061788eae05c219f71de5d5bea974819b2baee;hpb=4481b372ba150c669b2fefe2d6ec5dccb5da1d40;p=public-inbox.git diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index 64061788..da3a95d2 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -137,9 +137,15 @@ sub eml2mboxcl2 { sub git_to_mail { # git->cat_async callback my ($bref, $oid, $type, $size, $arg) = @_; + my ($write_cb, $smsg) = @$arg; + if ($type eq 'missing' && $smsg->{-lms_ro}) { + if ($bref = $smsg->{-lms_ro}->local_blob($oid, 1)) { + $type = 'blob'; + $size = length($$bref); + } + } return warn("W: $oid is $type (!= blob)\n") if $type ne 'blob'; return warn("E: $oid is empty\n") unless $size; - my ($write_cb, $smsg) = @$arg; die "BUG: expected=$smsg->{blob} got=$oid" if $smsg->{blob} ne $oid; $write_cb->($bref, $smsg); } @@ -644,6 +650,7 @@ sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; $lei->_lei_atfork_child; + $self->{-lms_ro} = $lei->{lse}->lms if $lei->{lse}; $lei->{auth}->do_auth_atfork($self) if $lei->{auth}; $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; @@ -665,6 +672,7 @@ sub poke_dst { sub write_mail { # via ->wq_io_do my ($self, $smsg, $eml) = @_; return $self->{wcb}->(undef, $smsg, $eml) if $eml; + $smsg->{-lms_ro} = $self->{-lms_ro}; $self->{lei}->{ale}->git->cat_async($smsg->{blob}, \&git_to_mail, [$self->{wcb}, $smsg]); }