From patchwork Mon May 29 14:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50440 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 346F927BBEA; Mon, 29 May 2023 15:48:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC7B527BBE2 for ; Mon, 29 May 2023 15:48:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3e9d-0002LE-DD; Mon, 29 May 2023 10:47:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3e9K-000233-Kf for guix-patches@gnu.org; Mon, 29 May 2023 10:47:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3e9K-00033x-D6 for guix-patches@gnu.org; Mon, 29 May 2023 10:47:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3e9K-0001Pn-9Z for guix-patches@gnu.org; Mon, 29 May 2023 10:47:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63571] [PATCH v2 12/19] import: cpan: Remove unary 'string-append' call. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 14:47:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63571@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 63571-submit@debbugs.gnu.org id=B63571.16853716005281 (code B ref 63571); Mon, 29 May 2023 14:47:06 +0000 Received: (at 63571) by debbugs.gnu.org; 29 May 2023 14:46:40 +0000 Received: from localhost ([127.0.0.1]:58785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e8u-0001N2-0x for submit@debbugs.gnu.org; Mon, 29 May 2023 10:46:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e8E-0001J5-HO for 63571@debbugs.gnu.org; Mon, 29 May 2023 10:45:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3e89-0002fU-Af; Mon, 29 May 2023 10:45:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=2hxGdaAKbuwbDaEtf1LLiwzQpIAviJMAYlbDm445Kes=; b=YZ9S8gQQPaC0EdmkucaT 202/ux/3PzsBC4YZm3hdK3kA0Z6ceZt4LAAMEZqVbte5PdsVfcA76e1Ylsfc07NsInasg0HFUKKVZ bIum/WvublhZjca4JmZnc7RWOhD4Fy9i2sKS7yuuqyc00JhN0dDU8r/J8xoJBRTl90tFIzwBJbaHu 6rj3RYt55DKXVkR5NvQ7+oy3JXxAxkYxaRp8pikVYgJ/GXsZuZEFkmIWBEz467dMZ4NB0K5cdteut +QH2QI7Zfew5fThBWgP7wet/cacNOB6QkT/j+CKSO5hG//vo6HqnfKgVBraLjc10nmA5cRlXQ1s7r UYQYYwuctx90Zg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3e88-00044B-Tm; Mon, 29 May 2023 10:45:53 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 29 May 2023 16:45:23 +0200 Message-Id: <9327c192a21c1ad11581d117d6a9848c5b4e39c9.1685371175.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <87y1l7fb9j.fsf@gnu.org> References: <87y1l7fb9j.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/cpan.scm (package->upstream-name): Remove useless 'string-append'. --- guix/import/cpan.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index da47018c35..d7f300777e 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -154,7 +154,7 @@ (define (package->upstream-name package) ((? origin? origin) (match (origin-uri origin) ((or (? string? url) (url _ ...)) - (match (string-match (string-append "([^/]*)-v?[0-9\\.]+") url) + (match (string-match "([^/]*)-v?[0-9\\.]+" url) (#f #f) (m (match:substring m 1)))) (_ #f)))