From patchwork Tue Dec 15 09:57:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 25795 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 0936827BC05; Tue, 15 Dec 2020 09:59:22 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 B007F27BC04 for ; Tue, 15 Dec 2020 09:59:21 +0000 (GMT) Received: from localhost ([::1]:54078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kp772-0000XH-Tw for patchwork@mira.cbaines.net; Tue, 15 Dec 2020 04:59:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kp75o-0007ib-8i for guix-patches@gnu.org; Tue, 15 Dec 2020 04:58:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kp75n-0004YU-JP for guix-patches@gnu.org; Tue, 15 Dec 2020 04:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kp75n-0007Bf-JB for guix-patches@gnu.org; Tue, 15 Dec 2020 04:58:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45253] [PATCH 4/6] daemon: Do not reset timestamps and permissions on substituted items. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Dec 2020 09:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45253@debbugs.gnu.org Received: via spool by 45253-submit@debbugs.gnu.org id=B45253.160802626927571 (code B ref 45253); Tue, 15 Dec 2020 09:58:03 +0000 Received: (at 45253) by debbugs.gnu.org; 15 Dec 2020 09:57:49 +0000 Received: from localhost ([127.0.0.1]:55673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kp75Y-0007AW-Mp for submit@debbugs.gnu.org; Tue, 15 Dec 2020 04:57:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kp75V-00079Z-Mu for 45253@debbugs.gnu.org; Tue, 15 Dec 2020 04:57:45 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48638) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kp75Q-0004RD-00; Tue, 15 Dec 2020 04:57:40 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=44330 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kp75P-0001j8-7j; Tue, 15 Dec 2020 04:57:39 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 15 Dec 2020 10:57:28 +0100 Message-Id: <20201215095730.10954-4-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201215095730.10954-1-ludo@gnu.org> References: <20201215095730.10954-1-ludo@gnu.org> 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 substitute' now takes care of it via 'restore-file'. * nix/libstore/build.cc (SubstitutionGoal::finished): Remove call to 'canonicalisePathMetaData'. --- nix/libstore/build.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index b19471a68f..ea809c6971 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -3085,7 +3085,8 @@ void SubstitutionGoal::finished() if (repair) replaceValidPath(storePath, destPath); - canonicalisePathMetaData(storePath, -1); + /* Note: 'guix substitute' takes care of resetting timestamps and + permissions on 'destPath', so no need to do it here. */ worker.store.optimisePath(storePath); // FIXME: combine with hashPath()