From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 8OWAOqBkPmfdcAAA62LTzQ:P1 (envelope-from ) for ; Wed, 20 Nov 2024 22:37:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 8OWAOqBkPmfdcAAA62LTzQ (envelope-from ) for ; Wed, 20 Nov 2024 23:37:21 +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=Dp7eBgRh; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N6cg8MCg; dmarc=pass (policy=none) header.from=gnu.org; 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=1732142240; a=rsa-sha256; cv=none; b=kMv2+Ag7goibxkNxxn1/rrDGMpx/66WhH7naMUhHOPAl/RDxrAn//pscnR9dQJ8PZ/Xdk+ YOzNH9q94T65DL95ph67YTti53alhOVlg6FnCjgdcOl33i41Cy9mNrrx82k+2OcQA1osyi NJqUoshZ7VQXspSzncXK4CJQycUaT7yz/es1s7eLQxKd3rwoBdInlQbvG1Txe6td19BWkd 1zX7tZ9f/5tVZgl8tWN/Ebi60ipkzEy3jktTD41GZGZTlkLRTBEgyA4lvpm5aAYxfVtMr9 MryATJ8CpZ9TOduUE15YatdvE0VoBgF4ejyOeTl4cN1CgycjhW/XnjwAlD1H7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Dp7eBgRh; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N6cg8MCg; dmarc=pass (policy=none) header.from=gnu.org; 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=1732142240; 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=rm5nPtH/gjtLMWEHkZdxeHQemPqzGZi+Fi5U2KEXidc=; b=SyiEWc2EFe+UMJVhnJmHE8VH1eevEWRQ7Ue4WpeEaPYBuw+JqzBGeFTEb7rWtUNyKfv20q Hhx2BFk+vdFVsmYL3wh0y0lJ+ByEAqP20wx0UZUnkHT/VaAPjjx5D+WLRQoBrGTAKSdCa5 v5tFvg1zggP3L8PpOTMU9By/W1kmge/G+5RvhvNLIfgy6vuWr+wh8d6/gp5RBy6WqffvVb ug3CIH1my/E1FNx5ujfQczeoMcvtvlKfP7S0YNIPdofwVY6owUTNiU7qm4MPOXxf0E82S5 Ql8QI/jZYjdZBRn3p63eMyVtISH1kC0gSmTV/3COwrWn8iU5NYyWUmjBrn5d4A== 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 92118336 for ; Wed, 20 Nov 2024 23:37:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDtJn-0005kc-M2; Wed, 20 Nov 2024 17:37:03 -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 1tDtJm-0005kJ-B8 for guix-patches@gnu.org; Wed, 20 Nov 2024 17:37:02 -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 1tDtJm-0008R9-39 for guix-patches@gnu.org; Wed, 20 Nov 2024 17:37:02 -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=rm5nPtH/gjtLMWEHkZdxeHQemPqzGZi+Fi5U2KEXidc=; b=Dp7eBgRhxvVt8+WqmGzBhaAYV0pVZIvNLjYZitWvQ5m6XOaeCZyNSIaZ0iAUXaMYj/oVbHXLkjxz6ld4JJnMvZQZgkLqUbA+UZeaRn8V1OTBZAOKGpSzWui4YJiYtH2qZerQAk/QW8krhvUwhh0GX1TmmELXlpNLEC5bNf03g4ULac22qw1Ln2Ij++uXN33KKs4hp3l1YL2MLEcQMV65/vt8Q/HmJJQUPnhyHHUbV+gxRPy/cnC3DILHaCuQexVDMIj3OwAleBbUV5Fw2R37Q1Cvee56KB9GcQLsIoI0Zj8IKJB1j4l9SQia33/sWjeYx6Ex6k7UE5N9BNRHa4ScaQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDtJl-0004GB-Td for guix-patches@gnu.org; Wed, 20 Nov 2024 17:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#71217] gnu: home: dotfiles: Files not excluded when they should Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 22:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Odermatt-Lemay Cc: 71217@debbugs.gnu.org, Giacomo Leidi Received: via spool by 71217-submit@debbugs.gnu.org id=B71217.173214217116305 (code B ref 71217); Wed, 20 Nov 2024 22:37:01 +0000 Received: (at 71217) by debbugs.gnu.org; 20 Nov 2024 22:36:11 +0000 Received: from localhost ([127.0.0.1]:48141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtIx-0004Ev-8h for submit@debbugs.gnu.org; Wed, 20 Nov 2024 17:36:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtIv-0004Ec-7A for 71217@debbugs.gnu.org; Wed, 20 Nov 2024 17:36:09 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDtGk-0007o1-FG; Wed, 20 Nov 2024 17:33:54 -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:References:In-Reply-To:Subject:To: From; bh=rm5nPtH/gjtLMWEHkZdxeHQemPqzGZi+Fi5U2KEXidc=; b=N6cg8MCgLoBaOLW2QtGB V+dlAQz1E5sCCbgMsF3I2C/YPzyI5YWM6WacFfgx/ttzsaThPiF/yI+bUTtzjrAvsNCbQbHPCLtWj HVQbuKvMmHVlvDLw57ySHMLmM5Ffm+FDv03GhP9oq2PEUm2MXMFMKJ6yXsoU1IvTeUkQnJ6xMtIfD 3tdWAM3pU0WXZHUxIV54MbEh+/6mMBwxUqWo6ZShF42Dt8COeEmN7OUknjyNAhELXkLVhlJldb48z 0EmFTvTkY7XML+y4Jg6OH4mCVCujAFepBoyDIg8g0k5FSKRJXzubO3trE3FKo6zcrsB4kkSFSQhbK s7o5CDbGqHvYaw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Nicolas Odermatt-Lemay's message of "Sun, 26 May 2024 22:13:26 -0400") References: Date: Wed, 20 Nov 2024 23:33:52 +0100 Message-ID: <87zflttu0f.fsf@gnu.org> 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: 92118336 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.65 X-Spam-Score: -8.65 X-TUID: yuqoftUYEovY Hi, (Cc: Giacomo, who authored this service.) Nicolas Odermatt-Lemay skribis: > While attempting to setup home-dotfiles-service, I noticed that some files > were being symlinked even though they were in the variable > `%home-dotfiles-excluded', such as all the files of the .git directory. Oh. > This patch seems to fix the problem : > > diff --git a/gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.= scm > index 823bdb03fb..38f7ff83d0 100644 > --- a/gnu/home/services/dotfiles.scm > +++ b/gnu/home/services/dotfiles.scm > @@ -45,7 +45,7 @@ (define-module (gnu home services dotfiles) > (define %home-dotfiles-excluded > '(".*~" > ".*\\.swp" > - "\\.git" > + "\\.git/.*" > "\\.gitignore")) > > (define %home-dotfiles-layouts > @@ -138,8 +138,7 @@ (define* (directory-contents directory #:key (packages > #f)) > (define (filter-files directory) > (find-files directory > (lambda (file stat) > - (not (regexp-exec exclusion-rx > - (basename file)))))) > + (not (regexp-exec exclusion-rx file))))) That would change the semantics of =E2=80=98exclusion-rx=E2=80=99 though. Maybe instead we should change from =E2=80=98file-files=E2=80=99 to =E2=80= =98file-system-fold=E2=80=99 and not enter directories that match one of the exclusion patterns? Ludo=E2=80=99.