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,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 4DA3E1F560 for ; Fri, 22 Sep 2023 21:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1695417196; bh=rUUZPLces00mVCjwjsFZ3u9ekOG8Rq8dLgXklKdjuFM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=puTgZ+K+JW5YJ0WBPPG6K2QlfrbHSI2FMGD8WIoQ0w/cgw8Aye/R30fOejxcJ9s8q izKfl4rKmZEeILqk6xaDZ0OV49sKQ+/zk8oBVScYmBr11upyaP16XgjzBSKbNCeRhP 61t80xHL9lRSErySJ3ENJfKJRzFD3tV+tFcursK0= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/4] lei blob|rediff: fix usage of lei->fail Date: Fri, 22 Sep 2023 21:13:13 +0000 Message-ID: <20230922211316.3060039-2-e@80x24.org> In-Reply-To: <20230922211316.3060039-1-e@80x24.org> References: <20230922211316.3060039-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: lei->fail only takes one message argument, presently; but it's probably a good idea to change the API... --- lib/PublicInbox/LeiBlob.pm | 2 +- lib/PublicInbox/LeiRediff.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm index 1692289c..5fc6d902 100644 --- a/lib/PublicInbox/LeiBlob.pm +++ b/lib/PublicInbox/LeiBlob.pm @@ -158,7 +158,7 @@ sub lei_blob { if ($lxs->remotes) { require PublicInbox::LeiRemote; $lei->{curl} //= which('curl') or return - $lei->fail('curl needed for', $lxs->remotes); + $lei->fail('curl needed for '.join(', ',$lxs->remotes)); $lei->_lei_store(1)->write_prepare($lei); } require PublicInbox::SolverGit; diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm index c312d90f..9cf95c08 100644 --- a/lib/PublicInbox/LeiRediff.pm +++ b/lib/PublicInbox/LeiRediff.pm @@ -268,7 +268,7 @@ sub lei_rediff { if ($lxs->remotes) { require PublicInbox::LeiRemote; $lei->{curl} //= which('curl') or return - $lei->fail('curl needed for', $lxs->remotes); + $lei->fail('curl needed for '.join(', ',$lxs->remotes)); } $lei->ale->refresh_externals($lxs, $lei); my $self = bless {