From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 08/18] fetch: use run_qx
Date: Fri, 27 Oct 2023 09:40:29 +0000 [thread overview]
Message-ID: <20231027094039.3788289-8-e@80x24.org> (raw)
In-Reply-To: <20231027094039.3788289-1-e@80x24.org>
---
lib/PublicInbox/Fetch.pm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Fetch.pm b/lib/PublicInbox/Fetch.pm
index e41dd448..b0f1437c 100644
--- a/lib/PublicInbox/Fetch.pm
+++ b/lib/PublicInbox/Fetch.pm
@@ -5,7 +5,7 @@ package PublicInbox::Fetch;
use v5.12;
use parent qw(PublicInbox::IPC);
use URI ();
-use PublicInbox::Spawn qw(popen_rd run_wait);
+use PublicInbox::Spawn qw(popen_rd run_qx run_wait);
use PublicInbox::Admin;
use PublicInbox::LEI;
use PublicInbox::LeiCurl;
@@ -20,9 +20,8 @@ sub remote_url ($$) {
my $rn = $lei->{opt}->{'try-remote'} // [ 'origin', '_grokmirror' ];
for my $r (@$rn) {
my $cmd = [ qw(git config), "remote.$r.url" ];
- my $fh = popen_rd($cmd, undef, { -C => $dir, 2 => $lei->{2} });
- my $url = <$fh>;
- close $fh or next;
+ my $url = run_qx($cmd, undef, { -C => $dir, 2 => $lei->{2} });
+ next if $?;
$url =~ s!/*\n!!s;
return $url;
}
next prev parent reply other threads:[~2023-10-27 9:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 9:40 [PATCH 01/18] spawn: croak directly in C pi_fork_exec Eric Wong
2023-10-27 9:40 ` [PATCH 02/18] spawnpp: use autodie for syscall failures Eric Wong
2023-10-27 9:40 ` [PATCH 03/18] spawn: avoid alloca in C pi_fork_exec Eric Wong
2023-10-27 9:40 ` [PATCH 04/18] git: use run_qx to read `git --version' Eric Wong
2023-10-27 9:40 ` [PATCH 05/18] git: avoid extra stat(2) for git version Eric Wong
2023-10-27 9:40 ` [PATCH 06/18] import: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 07/18] treewide: use ->close method rather than CORE::close Eric Wong
2023-10-27 9:40 ` Eric Wong [this message]
2023-10-27 9:40 ` [PATCH 09/18] git_credential: use IO::Handle->close Eric Wong
2023-10-27 9:40 ` [PATCH 10/18] cindex: drop redundant close on regular FH Eric Wong
2023-10-27 9:40 ` [PATCH 11/18] admin: run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 12/18] config: use ->close for popen_rd pipe Eric Wong
2023-10-27 9:40 ` [PATCH 13/18] import: use ->close for fast-import socket Eric Wong
2023-10-27 9:40 ` [PATCH 14/18] lei_mirror: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 15/18] lei_rediff: ->close for popen_wr Eric Wong
2023-10-27 9:40 ` [PATCH 16/18] spamcheck/spamc: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 17/18] lei_xsearch: use ->close Eric Wong
2023-10-27 9:40 ` [PATCH 18/18] searchidx: ->close 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=20231027094039.3788289-8-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).