From patchwork Mon May 31 22:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 29715 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 2BE7027BC81; Mon, 31 May 2021 23:45:21 +0100 (BST) 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_H4,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 04F9527BC78 for ; Mon, 31 May 2021 23:45:21 +0100 (BST) Received: from localhost ([::1]:51036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnqeu-0006jI-4n for patchwork@mira.cbaines.net; Mon, 31 May 2021 18:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnqef-0006H5-Ql for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnqef-0007VM-Hr for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnqef-00041J-GE for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48766] [PATCH 08/14] guix: java-utils: Look for actual jar files. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 May 2021 22:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48766@debbugs.gnu.org Received: via spool by 48766-submit@debbugs.gnu.org id=B48766.162250110315423 (code B ref 48766); Mon, 31 May 2021 22:45:05 +0000 Received: (at 48766) by debbugs.gnu.org; 31 May 2021 22:45:03 +0000 Received: from localhost ([127.0.0.1]:35181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqed-00040W-Cy for submit@debbugs.gnu.org; Mon, 31 May 2021 18:45:03 -0400 Received: from lepiller.eu ([89.234.186.109]:38958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqeJ-0003xm-Gk for 48766@debbugs.gnu.org; Mon, 31 May 2021 18:44:43 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 7afa04f8 for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Lmo/Ac18qo00A5ae6mt9nsm+b 6uIpNIUDX1KDG6piT4=; b=Td6Eo8PO+2RUVlxRs6U079UHR+ubCWV6jtp4Glrjr fgdYPhFKNBVjotdHSo4055pnmci26Jw3MDhmBkpMsfF9TF6UGz//Dj9/NpsPF8Do U+GQ6Rg2NMSjjapey52wxJf2zcySkNdrXJQVTcJ3sjBykcfPA7TdSZlmmkmJzvl0 WU1X9p2/+8S6ZdaEbbRTg3kuRYXvpAknOf65UJY2CaZ2egEOM0vEQs7sIQlhpbrZ wwnVtJZa9/JId+JhkA6jgNUPxq/ugDruZoSDIQmiD34rOeCGQU1guBgIaCdhQsrr ACXuXeHWhWl9sSEnuootjZ+s5i7Vwf1F1lXOcbmFfceTg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3335224a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:39 +0000 (UTC) From: Julien Lepiller Date: Tue, 1 Jun 2021 00:44:21 +0200 Message-Id: <20210531224427.13300-8-julien@lepiller.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531224427.13300-1-julien@lepiller.eu> References: <20210601004100.69baa2d0@tachikoma.lepiller.eu> <20210531224427.13300-1-julien@lepiller.eu> 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/java-utils.scm (install-from-pom): Fix `find-files` to look only for jar files. --- guix/build/java-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 5a54a14c1b..87c3ac43c9 100644 --- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -125,7 +125,7 @@ the phase fails." version ".jar")))) ;; Otherwise, we try to find any jar file. (jars (if (null? jars) - (find-files "." ".*.jar") + (find-files "." "\\.jar$") jars)) (jar-name (string-append repository artifact "-" version ".jar")) (pom-name (string-append repository artifact "-" version ".pom")))