From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/4] import: avoid uninitialized comparison on failures
Date: Mon, 11 Nov 2024 21:56:55 +0000 [thread overview]
Message-ID: <20241111215656.2411957-4-e@80x24.org> (raw)
In-Reply-To: <20241111215656.2411957-1-e@80x24.org>
readline may return undef when fast-import fails (as triggered
by t/lei-store-fail.t). Ensure we give a more informative error
message in the syslog when this happens. Arguably, having this
in the syslog when a client is connected via terminal is probably
not great, but perhaps unavoidable...
---
lib/PublicInbox/Import.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 2e193d46..ae46c5f4 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -152,8 +152,8 @@ sub progress {
my ($self, $msg) = @_;
my $io = $self->{io} or return;
print $io "progress $msg\n" or wfail;
- readline($io) eq "progress $msg\n" or die
- "progress $msg not received\n";
+ my $res = <$io> // die "EOF from fast-import progress $msg: $!";
+ $res eq "progress $msg\n" or die "BUG: `$res' != `progress $msg'";
undef;
}
next prev parent reply other threads:[~2024-11-11 21:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 21:56 [PATCH 0/4] another round of small fixes Eric Wong
2024-11-11 21:56 ` [PATCH 1/4] t/inbox_idle: delay for low-res FS w/o inotify||kqueue Eric Wong
2024-11-11 21:56 ` [PATCH 2/4] t/spawn: increase timeout for slow systems Eric Wong
2024-11-11 21:56 ` Eric Wong [this message]
2024-11-11 21:56 ` [PATCH 4/4] view: avoid uninitialized var from diff query textarea Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111215656.2411957-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).