From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YPuCF3RsSWfv2AAAqHPOHw:P1 (envelope-from ) for ; Fri, 29 Nov 2024 07:25:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YPuCF3RsSWfv2AAAqHPOHw (envelope-from ) for ; Fri, 29 Nov 2024 08:25:40 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=F9lzHFuf; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=JOM7cMye; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732865140; a=rsa-sha256; cv=none; b=TXgMX4fkZJQ/eDZfvYtcMrN93dXNkwARUUGGCEzT9i+i4MDUBvXxOdi1Jxp1HODQ4hVc5p fWyvahJDNMawkbPxCobWIhQVxJvwc/dYRYN/VGgoJLGIuLpM4IocUUw4u/9WiZFbgOkX0D GQAnL4PwZn7NyOqn+Y0tGOwlWGomKS6ZoJU7o2eGUyPHSPMRLEpaKNCSefT7Y/9V15hcM6 /UUuvS/boGTlam4pDnFkwLSzHx11zu3lZPUfNkDcLytzyCZ5EV0d29U0qw+AmIFSHNiwCW B93NDAxZRYdwkctlxNQVZzutLohUa5CiMalhkcSeSlrat7nd3J3pXnW5D2AKwA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=F9lzHFuf; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=JOM7cMye; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732865140; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=f8onCShA5dE+WdU0Iha/bB4+Jmer/AlDxRjUU28b2J8=; b=OINeSSBAG6kpM3kv0NINpJJce5Gcq/j/P7hSB8LMsIFCFbYiKO6gGGLWAN/P5+PZHKlBT/ m2LkN5jaCnRItW33xaKzIgUw4gac+LDPPpvIM1L+qoW3LgDpPoWaUK10TcD8nNnxx8S79b a32eavyyhJ4ca14lkQavfUD+45T8mO8mGQSR0p52elh+znXfsYjLZNpsWV3iPehG/bjSWp wLUUyzrmiecOX8U2KPxxXWlkKZKFpM5QVVcG2iTVib2g4uxb/9+ezPNTj7OIFQGbTJXWnK mCv38JuZrc+EhiEXN3G3Tx/R3FqSkHzornrJHba2glkuSYqAgK62sVE+r0wIpg== 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 B1DAB561D1 for ; Fri, 29 Nov 2024 08:25:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGvNT-0005EI-1G; Fri, 29 Nov 2024 02:25:23 -0500 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 1tGvNF-00051d-5u for guix-patches@gnu.org; Fri, 29 Nov 2024 02:25:13 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tGvN9-0003n1-5G for guix-patches@gnu.org; Fri, 29 Nov 2024 02:25:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=f8onCShA5dE+WdU0Iha/bB4+Jmer/AlDxRjUU28b2J8=; b=F9lzHFufQMLB+JMzRV7LrA7P/lCI5NqtKR2NhQcb4MqdDGjk1NUeoKQyJ4tS3vNHwGfq919MYvpHIWzZ+tQa17vOqOkSHKWcAN+hPiEJVVnm0+K9m7uvr17SRs21NQja4JS7pNi/Ok5kHsMs1fCCYdCrSlW+6kxTnA8+wzrhcG+QfjAz+nOdxvrTXl7SoHw8OATGBBofhqcxNSTWx7ukDAbASFIwKFDABXC4+ZjY7X4hNCNtua4ZTa5bySG17WxhmstirMpTtOovfPQoHWCYXpgiAWWLUPeSakGEcf6ojSmCzY482Denb3Q1gTbrf4wSotkdoEDLLZ+U+bs4c4xRog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGvN9-0007M4-0R for guix-patches@gnu.org; Fri, 29 Nov 2024 02:25:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really merge directories in install phase. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Nov 2024 07:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: Tanguy Le Carrour , Munyoki Kilyungi , 74582@debbugs.gnu.org, jgart , Marius Bakke , Sharlatan Hellseher Received: via spool by 74582-submit@debbugs.gnu.org id=B74582.173286505328155 (code B ref 74582); Fri, 29 Nov 2024 07:25:02 +0000 Received: (at 74582) by debbugs.gnu.org; 29 Nov 2024 07:24:13 +0000 Received: from localhost ([127.0.0.1]:40738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGvML-0007K2-8A for submit@debbugs.gnu.org; Fri, 29 Nov 2024 02:24:13 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:52924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGvMJ-0007Jk-1v for 74582@debbugs.gnu.org; Fri, 29 Nov 2024 02:24:11 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Y04Rl20tTz9tD5; Fri, 29 Nov 2024 08:24:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1732865043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f8onCShA5dE+WdU0Iha/bB4+Jmer/AlDxRjUU28b2J8=; b=JOM7cMyeKVElc4OFk4FztDuDpjw2uy44W7BvRYPPP2duD9X+fIpgK4vVwPm9ySVF0bMnSr klpM2xKC2ZkiX+9MBv8pl9YDh1S5BsfQBkIfIjeQrGguvWOLvnsCjgZtH8rKiurLZahQwZ Pyd/j9YQCGsX2rNZHCZtuneurc1oHomvuj3QaDVWbOL5oWuZHVtNwkywPrPLk12k3oKY2k XwoUdpmN6ODkFqUXhiWYfBL7kh8l7pVFGOeXsBLQ0eQ7/jshFngerB05dXBdhOEaGNfZzg E4oZCojmVvm8yHZTOjm9/LydxO7NRAYIpknGMu0x2B6v9bOSIm6ydLRs1F+Rrg== Date: Fri, 29 Nov 2024 08:23:59 +0100 From: Lars-Dominik Braun Message-ID: References: <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@gmail.com> X-Rspamd-Queue-Id: 4Y04Rl20tTz9tD5 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: B1DAB561D1 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.15 X-Spam-Score: -8.15 X-TUID: M1aitkieGoT0 Hi, > + ;; Use 'copy-recursively' rather than 'rename-file' to guard > + ;; against the odd case where DESTINATION is a non-empty > + ;; directory, which may happen when using hybrid Python > + ;; build systems. > + (copy-recursively (string-append source "/" file) > + (string-append destination "/" file)) > + (delete-file-recursively (string-append source "/" file)) wouldn’t it be easier to remove this function entirely and move the shebang-replacement via POST-MOVE into a separate function (perhaps powered by FIND-FILES instead of SCANDIR)? I believe with this patch we can also remove &cannot-extract-multiple-wheels further down, since directories should be merged now, right? Cheers, Lars