From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uK2EJGSyXV8MYwAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 05:47:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eG7XHmSyXV8oXwAAB5/wlQ (envelope-from ) for ; Sun, 13 Sep 2020 05:47:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F3695940221 for ; Sun, 13 Sep 2020 05:47:15 +0000 (UTC) Received: from localhost ([::1]:35814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr4-0004Rc-In for larch@yhetil.org; Sun, 13 Sep 2020 01:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqt-0004Q3-OL for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027h-DW for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqt-0000wB-Bx for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 4/5] rakudo-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759923535 (code B ref 43367); Sun, 13 Sep 2020 05:47:03 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:32 +0000 Received: from localhost ([127.0.0.1]:49346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqO-0000uw-3H for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:32 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:64818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqJ-0000u0-HV for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:27 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Bpz4s4XxhzKmc3 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ur2jpyG4b+NO01Y6UbYtAKyVgRPbQrk9jUkfdt5VRyA=; b=dgQT1JIrK3d47hACEwzTZwbHDYTUkRdiM0Rnamz9w8rVAvHwAYc6yau/uZ1OVTHVQfzP/C T5IdA2I46qbplD1vlZwkFQwql/uFt6ofxnYIYZoUh5imub4byaRLbi9xple9zgSNq5kTaC dGid1t4hB/KAZink6hVPOFKmp4P0NCg1RbW5Cnute6BhWjPih4zlGHkxuWjhciIJdeIFkc LlXBVDrSIrqbrdFxSVIrPbHT8YU2CqOQGxKLpUvuDp0V8e1aVCxW+GkVuTMY5c1WCcKzHh CZDbnadKsZfSlju1BqtEm+lKU8BQyLXYYIroP+G/6CoLjmB9ypV5W1XaqmcyEA== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id c5Ix7i6P-ZDh for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:19 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:56 +1000 Message-Id: <20200913054557.12911-4-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.15 / 15.00 / 15.00 X-Rspamd-Queue-Id: 9F05326E X-Rspamd-UID: 6cc3e5 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 6.49 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=brendan.scot header.s=MBO0001 header.b=dgQT1JIr; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam: Yes X-TUID: RaVVwHHbIlRm * guix/build/rakudo-build-system.scm (wrap): Don't return any potential already wrapped-programs in the list-of-files to wrap. --- guix/build/rakudo-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/rakudo-build-system.scm b/guix/build/rakudo-build-system.scm index dbdeb1ccd2..b2c090f946 100644 --- a/guix/build/rakudo-build-system.scm +++ b/guix/build/rakudo-build-system.scm @@ -97,7 +97,8 @@ (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) (let ((s (stat (string-append dir "/" f)))) - (eq? 'regular (stat:type s))))) + (and (eq? 'regular (stat:type s)) + (not (wrapped-program? f)))))) '()))) (define bindirs -- 2.28.0