dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 07/16] git: improve error reporting
Date: Sun,  1 Oct 2023 02:43:14 +0000	[thread overview]
Message-ID: <20231001024323.1960491-7-e@80x24.org> (raw)
In-Reply-To: <20231001024323.1960491-1-e@80x24.org>

We can use autodie for socketpair to handle errors for us,
but we need Time::HiRes::stat so we must write the error message
ourselves if stat-ing the git executable fails.
---
 lib/PublicInbox/Git.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 5003be53..1dbd10b7 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -10,6 +10,7 @@ package PublicInbox::Git;
 use strict;
 use v5.10.1;
 use parent qw(Exporter PublicInbox::DS);
+use autodie qw(socketpair);
 use POSIX ();
 use IO::Handle; # ->blocking
 use Socket qw(AF_UNIX SOCK_STREAM);
@@ -57,7 +58,7 @@ my ($GIT_EXE, $GIT_VER);
 
 sub check_git_exe () {
 	$GIT_EXE = which('git') // die "git not found in $ENV{PATH}";
-	my @st = stat($GIT_EXE) or die "stat: $!";
+	my @st = stat($GIT_EXE) or die "stat($GIT_EXE): $!";
 	my $st = pack('dd', $st[10], $st[7]);
 	if ($st ne $EXE_ST) {
 		my $rd = popen_rd([ $GIT_EXE, '--version' ]);
@@ -144,8 +145,7 @@ sub last_check_err {
 sub _sock_cmd {
 	my ($self, $batch, $err_c) = @_;
 	$self->{sock} and Carp::confess('BUG: {sock} exists');
-	my ($s1, $s2);
-	socketpair($s1, $s2, AF_UNIX, SOCK_STREAM, 0) or die "socketpair $!";
+	socketpair(my $s1, my $s2, AF_UNIX, SOCK_STREAM, 0);
 	$s1->blocking(0);
 	my $opt = { pgid => 0, 0 => $s2, 1 => $s2 };
 	my $gd = $self->{git_dir};

  parent reply	other threads:[~2023-10-01  2:43 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-01  2:43 [PATCH 01/16] git: decouple cat_async_retry from POSIX pipe semantics Eric Wong
2023-10-01  2:43 ` [PATCH 02/16] git: use Unix stream sockets for `cat-file --batch-*' Eric Wong
2023-10-01  2:43 ` [PATCH 03/16] git+gcf2client: switch to level-triggered wakeups Eric Wong
2023-10-01  2:43 ` [PATCH 04/16] gcf2: Eric Wong
2023-10-01  2:43 ` [PATCH 05/16] t/git: show git_version in diag output Eric Wong
2023-10-01  2:43 ` [PATCH 06/16] process_pipe: do not run `close' perlop unless requested Eric Wong
2023-10-01  2:43 ` Eric Wong [this message]
2023-10-01  2:43 ` [PATCH 08/16] git: packed_bytes: account for TOUTTOC between glob and stat Eric Wong
2023-10-01  2:43 ` [PATCH 09/16] gcf2client: warnings Eric Wong
2023-10-01  2:43 ` [PATCH 10/16] lei rediff: order-file support Eric Wong
2023-10-01  2:43 ` [PATCH 11/16] lei: correct exit signal Eric Wong
2023-10-01  2:43 ` [PATCH 12/16] lei mail-diff: remove correct temporary directory Eric Wong
2023-10-01  2:43 ` [PATCH 13/16] lei rediff: perl -e instead of -E Eric Wong
2023-10-01  2:43 ` [PATCH 14/16] lei_store: unlink early Eric Wong
2023-10-01  2:43 ` [PATCH 15/16] overidx: fix version comparison Eric Wong
2023-10-01  2:43 ` [PATCH 16/16] enable warnings globally 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231001024323.1960491-7-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.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).