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 sHV6HgWhXWeUUwEAqHPOHw:P1 (envelope-from ) for ; Sat, 14 Dec 2024 15:15:17 +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 sHV6HgWhXWeUUwEAqHPOHw (envelope-from ) for ; Sat, 14 Dec 2024 16:15:17 +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=sxM7bJ1z; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ps5om34P; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734189317; 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=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=IziLwCs5ZBxN8g1CAzUa7/cir+s43LmR2IP0XA5T2VpSWeAi7kpWYvDRHu3DUYwDy9X2Hd aO+w5CXKu1/E7UJzBh4Yr73eXk20YwH6T64lkfN2nowB6V2xju7pmeHZ56O0H6xh3cFQZo w/IDz0VJdqZfMoiAySqJygm7PiRqfTayxvt/Tgh5GFO9xfk10cjW7Dyknj/mVREKIqbSRI wrJ8OfuIoSK0UZXyuK/QpbALcjH789mfrCjMDPfBa91h8VoWSXcF9dRKVvoNzdge87laKE Gkvp5CImFKmhZPM26vi3APkITEitM2Rlt4J40tUo2Hj+vEjbAaXI17LWOqU66g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=sxM7bJ1z; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ps5om34P; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734189317; a=rsa-sha256; cv=none; b=HVadtOVeNjO2OxC7Kh/11Pv3vOXA1AbB89QiMARme5eY+sT0FomdSE5aDloaTa/HH2TSH7 lWbU3UImCFTLEOIxFHoZrhp/fJkqwv7RsUKF4PuDKCsSTknBipHlzmyq12wdg1oiLYibVh qyCQJ8hvRgDvbGR/nXZUGqISimvt1rcG5BDLTpu/OoVs0S9y27QvwT4P9Gj7tiU3sPsMU0 Vv0kt+NRv7t5Gw/AX76jY5r0CNk1Wdnyt3Qh5TqGissw5dH5r/K/5/2IKx+Os8AGEWUd0n dEJDDe4a6XtOeptvYjc6ntQ7ViyDO5ywRJEInkHxn2buoQuuAaoKHjzzGnwAwg== 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 0F3D45EC47 for ; Sat, 14 Dec 2024 16:15:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMTrH-00034e-39; Sat, 14 Dec 2024 10:15:07 -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 1tMTrF-00034A-6I for guix-patches@gnu.org; Sat, 14 Dec 2024 10:15:05 -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 1tMTrD-0002D9-Pq for guix-patches@gnu.org; Sat, 14 Dec 2024 10:15:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=sxM7bJ1zkep3PgBPmBp1gn7gZZj6UtLd28giG+JD0dMtx8l8fsxVY3WCuVPK5G4jhsmeJxPTnvc/IgJg4AjppxIqDtGtxaABRbifPARbh6C2bfcvCQh6RjAIfMr2o47bLI9seJctXNzFO350xRQT3+taaSPg3dPUlSkJW5pYROLMTrbTyQpRW+MIsKHvDlGpW3M5fvdE3aL5yYGLlNF4tD2uXDI6y9ICVYolywCmGZlGAOVatf7G8MlDrxwM4xeKK5+McEN0vWceNb/yazY2jTYm36DNsLw3rmTknLcdRg1s25lt5Sbtj87K/93V0K3gJum+tT9BsZ5wfhzk9emNeA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMTrC-00071D-80 for guix-patches@gnu.org; Sat, 14 Dec 2024 10:15:02 -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: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Dec 2024 15:15: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: Lars-Dominik Braun 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.173418925926906 (code B ref 74582); Sat, 14 Dec 2024 15:15:02 +0000 Received: (at 74582) by debbugs.gnu.org; 14 Dec 2024 15:14:19 +0000 Received: from localhost ([127.0.0.1]:47994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMTqU-0006zu-GO for submit@debbugs.gnu.org; Sat, 14 Dec 2024 10:14:18 -0500 Received: from mail-pf1-f169.google.com ([209.85.210.169]:56751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMTqR-0006zc-CG for 74582@debbugs.gnu.org; Sat, 14 Dec 2024 10:14:16 -0500 Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-725d9f57d90so1954832b3a.1 for <74582@debbugs.gnu.org>; Sat, 14 Dec 2024 07:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734189189; x=1734793989; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=Ps5om34P6ZsMXKapr9PnhCco3suScwE85kvWLKO6m+8Fve98nyC269MIxu1/TcWW5q rjBUxnnHDzRv+Dk0/B/JkKRCWsH1wgvGcyhA+uaT46kBdzuN/mskGQ7OtxpeeL9sTSsu AQA2L447AEqvs5Kv8775hs51J+Ji4kDSNCU4Wx6xvz/5uK6VhV7cRDOVXBRO94MeeJJ9 KYtFi9MACwtTuKl8uxlbf+JwVgyadGlkJwQs7pXpqXYWNXXJrIWQmNBZ/F2AjB+2STPY 8NpLW3Qkyo/cS+lnoELS+QD4d5e0R4KMoLCJJG7d6k8wnCehqwe8/wu6WbnpqIUuTlUx 7rgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734189189; x=1734793989; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=nrek37meWK7bwuN2F/eloUZ0Dqt33DA0E7X3c10kSm0VFXrStHMO71Q84dtufNQ6W+ Ty5Vk5EA6t6oaEMfJ9FTwuFlQ18Rpb92qQ+XH4tyjrjkKaEe9s4sHsejcJQ/0ATJwxgc y0PmThkKZWjUNbvR0eH0TeF4KyF//eddBW5zvY9T2jPbQtu3qtUwpUnFAPLWAGToZxsP 6WInIoPDVReM6D6CIDi4C0bP1sbtIFZGmvYqLu80Dtw6UianfXvyg67v1GPvGcc60BZm Z2ibzQtPo+li3rSZd4hRa7B44lxLfxUkpYxnrHyR/1Ihdbu2jKhu2EwcsMBy2TCi+HVw ADLA== X-Gm-Message-State: AOJu0YyIk3Pppx9JIParahHhCfnuJx0MrW9IAsaOfex2dLGv97YTdnKW qIlDQRTbG/IUrZgBjWo8RslHvQCOOSnWRR4KZhN0Yp3F29bxZAVd X-Gm-Gg: ASbGnctbVsPtOK4IZJdPkZSvtgmdIZalRGu+dQWmNVcIvAmZb9fV0WzIs/c/kjvgBlv 3wx/ccxgIODrwWh/N4YUuqQLGupC9hOhH05V9w9rATcr2PH8vJSYIjsi5MBYKMjbsPnKa+/55TM dPDecOPo9MtStogDRPuf+irQWDo1m2ATLdA1E/Le97JI/GujSYactcjhNkoQkrsb61PkoPvA8m/ 3xetdu1tE6v96IP+/mTv4lz2ScXzVar0iRJzlj6HkN17FBbujGIbQ== X-Google-Smtp-Source: AGHT+IEPRsU60ptn2Dn3WXtxtqrvFmfaHS2P4xYJuDkH49JSwa8vNABau0hYZvlck7o1RB4hexgkFw== X-Received: by 2002:a05:6a21:1796:b0:1e1:a75a:c452 with SMTP id adf61e73a8af0-1e1dfdacb2fmr10810752637.19.1734189189532; Sat, 14 Dec 2024 07:13:09 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-801d5c33f49sm1332453a12.69.2024.12.14.07.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2024 07:13:09 -0800 (PST) From: Maxim Cournoyer In-Reply-To: (Lars-Dominik Braun's message of "Fri, 29 Nov 2024 08:23:59 +0100") References: <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@gmail.com> Date: Sun, 15 Dec 2024 00:12:58 +0900 Message-ID: <87v7vm1eo5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: 0F3D45EC47 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.95 X-Spam-Score: -7.95 X-TUID: Dy26xwzX4MSN Hi, Lars-Dominik Braun writes: > Hi, > >> + ;; Use 'copy-recursively' rather than 'rename-file' t= o guard >> + ;; against the odd case where DESTINATION is a non-em= pty >> + ;; directory, which may happen when using hybrid Pyth= on >> + ;; build systems. >> + (copy-recursively (string-append source "/" file) >> + (string-append destination "/" file= )) >> + (delete-file-recursively (string-append source "/" fi= le)) > > wouldn=E2=80=99t it be easier to remove this function entirely and move t= he > shebang-replacement via POST-MOVE into a separate function (perhaps > powered by FIND-FILES instead of SCANDIR)? Yes, that could be nicer. I'd like to keep it for a distinct commti though, to keep this small and focus. > I believe with this patch we can also remove &cannot-extract-multiple-whe= els > further down, since directories should be merged now, right? Perhaps, though we'd want to verify that it indeed now works, and not having seen that error once, I'm not too sure how to test it. Do you know of a package that could make use of this? --=20 Thanks, Maxim