From patchwork Tue Feb 23 11:00:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TcSDZMSDbGluIElvbmVsIFBhdHJhyJljdQ==?= X-Patchwork-Id: 27202 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 1E7A627BC49; Tue, 23 Feb 2021 11:02:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D86B027BC48 for ; Tue, 23 Feb 2021 11:02:22 +0000 (GMT) Received: from localhost ([::1]:55746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEVSQ-0001j8-3u for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 06:02:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEVS6-0001iX-QE for guix-patches@gnu.org; Tue, 23 Feb 2021 06:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEVS6-0001q7-I9 for guix-patches@gnu.org; Tue, 23 Feb 2021 06:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEVS6-0005z4-F4 for guix-patches@gnu.org; Tue, 23 Feb 2021 06:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46715] [PATCH] guix import: Fixing detection of Fortran files. Resent-From: =?utf-8?b?TcSDZMSDbGlu?= Ionel =?utf-8?b?UGF0cmHImWN1?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 11:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46715@debbugs.gnu.org Cc: rekado@elephly.net, =?utf-8?b?TcSDZMSDbGlu?= Ionel =?utf-8?b?UGF0cmE=?= =?utf-8?b?yJljdQ==?= X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.161407807222930 (code B ref -1); Tue, 23 Feb 2021 11:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2021 11:01:12 +0000 Received: from localhost ([127.0.0.1]:58404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEVRI-0005xm-8h for submit@debbugs.gnu.org; Tue, 23 Feb 2021 06:01:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:57216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEVRH-0005xf-10 for submit@debbugs.gnu.org; Tue, 23 Feb 2021 06:01:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEVRF-0001aB-1V for guix-patches@gnu.org; Tue, 23 Feb 2021 06:01:09 -0500 Received: from c2062.mx.srv.dfn.de ([194.95.238.172]:55511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEVR5-0001KW-Lf for guix-patches@gnu.org; Tue, 23 Feb 2021 06:01:08 -0500 Received: from localhost (localhost [127.0.0.1]) by c2062.mx.srv.dfn.de (Postfix) with ESMTP id 32DE63000EB; Tue, 23 Feb 2021 12:00:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mdc-berlin.de; h= content-type:content-type:content-transfer-encoding:mime-version :x-mailer:message-id:date:date:subject:subject:from:from :received:received:received; s=mdc; t=1614078040; x=1615892441; bh=R8FYyaKaXr0R1+biXX0bpF38b3NuBgmbTjmFzFw6NMM=; b=cZoUHJ3IE5KT EoI0wLAEeMIEvfeOYNKS8gVbZ3SxKQ1lEF//TIsQltNryBmbDfwYsydU0led/RCm BSXPcVGR0TvxtB7l+0T9bhreNzJ4Zsoxxg2lD4z2Uxy8PgHkxPkjteI6NImVlo+A qCR4KnP4YeI54HVObwSn98GYmpL2kuM= Received: from c2062.mx.srv.dfn.de ([127.0.0.1]) by localhost (mgw4-erl.srv.dfn.de [127.0.0.1]) (amavisd-new, port 20134) with ESMTP id XoPfAml8l4_U; Tue, 23 Feb 2021 12:00:40 +0100 (CET) Received: from SW-IT-P-EX4.mdc-berlin.net (mgw4.mdc-berlin.de [141.80.113.62]) by c2062.mx.srv.dfn.de (Postfix) with ESMTPS; Tue, 23 Feb 2021 12:00:40 +0100 (CET) Received: from Guix-Ubuntu18.04 (141.80.113.106) by SW-IT-P-EX4.mdc-berlin.net (141.80.113.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2176.2; Tue, 23 Feb 2021 12:00:40 +0100 From: =?utf-8?b?TcSDZMSDbGlu?= Ionel =?utf-8?b?UGF0cmHImWN1?= Date: Tue, 23 Feb 2021 12:00:21 +0100 Message-ID: <20210223110021.10765-1-madalinionel.patrascu@mdc-berlin.de> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-Originating-IP: [141.80.113.106] X-ClientProxiedBy: SW-IT-P-EX4.mdc-berlin.net (141.80.113.62) To SW-IT-P-EX4.mdc-berlin.net (141.80.113.62) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1012-25990.007 X-TM-AS-Result: No-10--4.868900-8.000000 X-TMASE-MatchedRID: p9rK+f8v5s/cQGiuGEM19JxVZzZr7+O7qb0OUk+lIL0/HwRyaRVM1ShJ cLlF3Y99vibj7bFSyvObHAuQ1dUnuWJZXQNDzktSamOGWbsSIFcGchEhVwJY31B3AZ+9IiUHDv9 dUeWenmF87P7JbZZzfjF/NHLpWiF5LJutez2dKWfi8zVgXoAltsYlDcGKIsCCC24oEZ6SpSk6XE E7Yhw4FgaVvygv4Mgenek0A5/LKMVDTk5AXvXcXLHUx6SmTFH3Ryvh4Lj5tSDKvGGj0XuWRAePF rIjBe3L2/OhR1B7NBEzwJVbQJxVX7dKECLo/klXhRFX0MbNzemQ4JrfEHpLweZmgnjb/yyM1RkH asLA4hI= X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--4.868900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1012-25990.007 X-TM-SNTS-SMTP: 44D166D7CC553D3C3CA0139216E4CB85C1382458DC23D38CB2D467481D26447C2000:F Received-SPF: pass client-ip=194.95.238.172; envelope-from=MadalinIonel.Patrascu@mdc-berlin.de; helo=c2062.mx.srv.dfn.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches This fixes a bug whereby Guix importer considers files like .f.* being Fortran's files. (find-files dir "\\.f(90|95)?") would consider a lot of files with an extension starting with f being a Fortran file. The right way is to consider only files ending with .f90 or .f95. *guix/import/cran.scm: changing pattern of the detection for Fortran's files to .f(90|95)$. Co-authored-by: Ricardo Wurmus --- guix/import/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index e8caf080fd..dbc858cb84 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -361,7 +361,7 @@ empty list when the FIELD cannot be found." (define (directory-needs-fortran? dir) "Check if the directory DIR contains Fortran source files." - (match (find-files dir "\\.f(90|95)?") + (match (find-files dir "\\.f(90|95)$") (() #f) (_ #t)))