From patchwork Sun Feb 27 13:40:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 637 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 8C99727BBEA; Sun, 27 Feb 2022 13:41:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2295727BBE9 for ; Sun, 27 Feb 2022 13:41:15 +0000 (GMT) Received: from localhost ([::1]:33024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOJnV-0001Xn-VT for patchwork@mira.cbaines.net; Sun, 27 Feb 2022 08:41:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJnL-0001Wk-0q for guix-patches@gnu.org; Sun, 27 Feb 2022 08:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOJnK-0007gH-P3 for guix-patches@gnu.org; Sun, 27 Feb 2022 08:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOJnK-0004R0-6z; Sun, 27 Feb 2022 08:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54180] [PATCH 00/12] Home: Clarify and better test symlink-manager.scm Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, go.wigust@gmail.com, public@yoctocell.xyz, guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 13:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54180@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andrew Tropin , Oleg Pykhalov , Xinglu Chen X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Oleg Pykhalov , Xinglu Chen Received: via spool by submit@debbugs.gnu.org id=B.164596924217001 (code B ref -1); Sun, 27 Feb 2022 13:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Feb 2022 13:40:42 +0000 Received: from localhost ([127.0.0.1]:57096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOJmz-0004Q9-WB for submit@debbugs.gnu.org; Sun, 27 Feb 2022 08:40:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:51654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOJmj-0004Pg-Tu for submit@debbugs.gnu.org; Sun, 27 Feb 2022 08:40:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJmj-0001RD-6X for guix-patches@gnu.org; Sun, 27 Feb 2022 08:40:25 -0500 Received: from [2001:470:142:3::e] (port=50120 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJmi-0007WG-UV; Sun, 27 Feb 2022 08:40:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Zr72DFM1jTnl6CB3px1IyjUtYfkp0957xa/Hz5Pjf1s=; b=VYS9WRL0mD5a2h DI2z3j1EfcVgLEoAfFuJmvuJXBCpZtcqvkhMsCkRCMvTlrBWPZp8oICmZmUXL3DfS/pewraVsHcpL DAC1S5bHPMx9/M0Zg/OFD1AkKvZDPhi7mXF1NZIE8MVqUerpdPfKi4I0IS6URnRszLOW8TrhWB5fW KWhR6orOcSd0iVMm03kbsVlLtpBPsEyy2pgOqAigMBE5PYUHD7J7lFBbHbEsDvTFf3Ug5RYCowvqP a64AM0v/6ViaT7+kyIrXJySea4ZWIyyjlBCPdqnay5i7nMqJzubZYxPRtwru8pZMqMk9CuWtY/A6/ XL+l0tOkey6gwByWT69g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55802 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOJmg-00068n-Q8; Sun, 27 Feb 2022 08:40:23 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 27 Feb 2022 14:40:06 +0100 Message-Id: <20220227134006.9860-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 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 Hello Guix! This patch set aims to increase test coverage for ‘guix home reconfigure’, to make symlink-manager.scm IMO easier to follow, and to have it more closely follow the project’s conventions. Functionality is unchanged. Thoughts? Thanks, Ludo’. Ludovic Courtès (12): home: symlink-manager: Clarify module imports. home: symlink-manager: Move helper procedures as top-level defines. home: symlink-manager: Use 'for-each' when used for effects. home: symlink-manager: Use 'file-is-directory?'. home: symlink-manager: Remove 'empty-directory?' and avoid TOCTTOU race. home: symlink-manager: Avoid extra 'lstat' call. tests: Make sure 'guix home reconfigure' backs up files. tests: Simplify use of 'local-file' in 'tests/guix-home.sh'. tests: Check 'guix home reconfigure' for a second generation. home: symlink-manager: 'cleanup-symlinks' uses 'file-system-fold'. home: symlink-manager: 'create-symlinks' uses 'file-system-fold'. home: symlink-manager: Rename "path" to "file" where appropriate. gnu/home/services/symlink-manager.scm | 355 ++++++++++++-------------- tests/guix-home.sh | 44 +++- 2 files changed, 198 insertions(+), 201 deletions(-) base-commit: 33ce3f1c866231a3015411fdce18a3e72649e2f6