From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3B2561F44D for ; Thu, 11 Apr 2024 18:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1712861906; bh=N8UxGmX3qbwaZiOC0qUiFi2GJWlqlP+R0ZYcqYQGINY=; h=From:To:Subject:Date:From; b=4HmqeEHiIbtz8b95hRfyu05BUtEzz6md29+pHuEU3UJcYHQTOYAXuJMkawiK04RRC KFfwRHnr6LxcDdLzdxc+6MSg5cJiTZ7qxptCagW37CFiSGeMOFPmhFez/orPDotyM6 WdGZ0nDz1KPEnTWRyxAbCmWuvzH1CV17ZYCH55D4= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei blob: fix attachment extraction for unimported||inflight Date: Thu, 11 Apr 2024 18:58:26 +0000 Message-ID: <20240411185826.2564743-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Noticed while trying to make other reliability improvements to lei... --- lib/PublicInbox/LeiBlob.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm index 127cc81e..00697097 100644 --- a/lib/PublicInbox/LeiBlob.pm +++ b/lib/PublicInbox/LeiBlob.pm @@ -119,14 +119,17 @@ sub lei_blob { } else { open $rdr->{2}, '>', '/dev/null' or die "open: $!"; } - my $cmd = [ 'git', '--git-dir='.$lei->ale->git->{git_dir}, - 'cat-file', 'blob', $blob ]; + my $cmd = $lei->ale->git->cmd('cat-file', 'blob', $blob); + my $cerr; if (defined $lei->{-attach_idx}) { my $buf = run_qx($cmd, $lei->{env}, $rdr); return extract_attach($lei, $blob, \$buf) unless $?; + $cerr = $?; + } else { + $rdr->{1} = $lei->{1}; # write directly to client + $cerr = run_wait($cmd, $lei->{env}, $rdr) or return; } - $rdr->{1} = $lei->{1}; - my $cerr = run_wait($cmd, $lei->{env}, $rdr) or return; + # fall back to unimported ('lei index') and inflight blobs my $lms = $lei->lms; my $bref = ($lms ? $lms->local_blob($blob, 1) : undef) // do { my $sto = $lei->{sto} // $lei->_lei_store;