From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iGUUK3rsU2YXfwAAe85BDQ:P1 (envelope-from ) for ; Mon, 27 May 2024 04:14:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iGUUK3rsU2YXfwAAe85BDQ (envelope-from ) for ; Mon, 27 May 2024 04:14:18 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=KJ7dxPQg; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF 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=1716776058; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=+hsyiKu0ufmqXrEyW9RrmoZUzzCTQSAWjC9ul35bfBo=; b=dfaOuwTEm5Ir74BiDAJFszwKGXO8Cp6Rf8kc0jgDxfcbKFUVt+ojdAfEKm6snJVm/t969J NKdqJP/AlOuPl0CjRcEvSE2RallxJkCCHyax/d3H4URXC8tPpsKri6ZSMGAM6kOpfgg+D5 swGkhnbI8ALaOZLrcb7Zm3WxC7zoy84ADxf2wAz38JpLvXqUv7ThtFPMw8fNV7kKjai63W 19G4yoRDMkF9Xes4O3IMDKfys1RpTtO/rRUOXIvuYk79vuTrJPHPvXxgKxlAiPF0218IbW 9cfagDer+WB+ROEErfU6W0REMO14jCHGeR5tUfvRSymO0LdLxSH0JzVvZ1XG0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=KJ7dxPQg; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716776058; a=rsa-sha256; cv=none; b=HltpHCM/4BUZ2VHv6znGUhiZUolC0yd6J27TyeYYMgd/F72L+C0UyNZ6kCHyQrqGxtPNro zxySeg7Sl9jwc0cWQatABly4xbB5H0zeXTzChqCpZwFQN/lqy9h+qA59OOV72SvelHKaY0 Filg0RJf/0Xz+1YmezMyBUJrH2jc1kUAvSi+OeSY8gF1eWJJpAcPkZLQY+u93F7FaHWAlr BQt53auaeLvyCE8eB7HoQ/qPnGxwYhJe0xahQfpPeTE6WJsJblaPXOb5CDITMmI/UcFXNE 7IafZhvt6YRIFdqUy9Ir6zgfgw+ODY9Ckhm2+u6WH/9nUPul8OjVULaZA4o+6g== 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 4E994268C2 for ; Mon, 27 May 2024 04:14:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBPs3-0005OM-J1; Sun, 26 May 2024 22:13:55 -0400 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 1sBPs2-0005Nu-4S for bug-guix@gnu.org; Sun, 26 May 2024 22:13:54 -0400 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 1sBPs1-0001Zf-Pa for bug-guix@gnu.org; Sun, 26 May 2024 22:13:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBPs9-0007wI-Sh for bug-guix@gnu.org; Sun, 26 May 2024 22:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#71217: gnu: home: dotfiles: Files not excluded when they should Resent-From: Nicolas Odermatt-Lemay Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 27 May 2024 02:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71217 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 71217@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171677603530494 (code B ref -1); Mon, 27 May 2024 02:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2024 02:13:55 +0000 Received: from localhost ([127.0.0.1]:42807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBPs2-0007vm-Km for submit@debbugs.gnu.org; Sun, 26 May 2024 22:13:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:56316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBPs0-0007ve-Qd for submit@debbugs.gnu.org; Sun, 26 May 2024 22:13:53 -0400 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 1sBPrq-0005L6-Eu for bug-guix@gnu.org; Sun, 26 May 2024 22:13:44 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBPrn-0001XC-BE for bug-guix@gnu.org; Sun, 26 May 2024 22:13:41 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2bfc7471028so331047a91.1 for ; Sun, 26 May 2024 19:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716776017; x=1717380817; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+hsyiKu0ufmqXrEyW9RrmoZUzzCTQSAWjC9ul35bfBo=; b=KJ7dxPQglNLBevl+5u6sxN/LPeHYthNJxwoKtnTsxtxb2OPFLls3P4ukEQqUQnc2/1 TUVWSHhVNI2Bi6jeYCSdvaM3UzLRZBK/HTyr/AvuqCQErinC99puKLyWYqrqe04C4Hbh 2CpJ/1CDhTyUzffJQo2sQxSmv3IrHTHWb/tlyO/Zsf6LHMAZb5m7yskNL8LLuORLt+Sr QYTCZiw8ASIXr/mDDIUXVOWAH0qcZh89zMiAg0hVi4L9gq1ADaKhA1+X4ulRtoSzasOF 9blNZbLN+0AYYyV1mBnoGeq0/L++Y1pTcs4yCHyYtNtM2ThkFu3zG0tbb/4CVzMLZrXK F2vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716776017; x=1717380817; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+hsyiKu0ufmqXrEyW9RrmoZUzzCTQSAWjC9ul35bfBo=; b=oPFMjBQSv8wlOwTNfEk+aZU03RT4tfvWV53axMkLcVvknY5T54aNRHDFsC/Ga51lSU bKPu/NyanaAhjoTyRsgWoUFbQd9j9BzMNWE8GfAyGhmRrAOeBrFVrxvmd22yBMQmM245 yyIM83ErJLPDlGHrFHZplM5wAuihFdrTJC405kKZDAJs+7EBT5i6WsREsdr0oJCV9PvN 4UPuFdu8UHxmwEEP6cv2pUiz+gB+55C/wg9NaDf1eu9CHwL6Y+bqTOof75Il4YscDSpI L6Lhbl3GuxZgqtoMDsIhjHu231VFQlTfPP8RLl0XJDpofA4EWk0cJ1LpJhzmqP2naqQB yG7w== X-Gm-Message-State: AOJu0YxQyRWhKC94KCpMGQXnUvo9GtRdwRDl42U8fUIn/WQCkfQC2fkj gjz7FMBCToAu4hD1CbZbsKanTynDY/d/tw5xDjmIw1HXMIIjtcsr1O/+2eXJaAifiN1Lvjam6Mf jNU5Yvqd2lZF2IiYKoSAs0/KLHfwigPrx X-Google-Smtp-Source: AGHT+IHk7NKLE2Q8rpSTmkJ8aJnwONr3PpP3kcDhSuZqDakYGCMzSVSkEo9qZCDsiJjnkJ3M73L4x8jkBiVpCUsKRdU= X-Received: by 2002:a17:90b:30c1:b0:2b1:b1a1:1310 with SMTP id 98e67ed59e1d1-2bf5f20265cmr7131603a91.29.1716776017046; Sun, 26 May 2024 19:13:37 -0700 (PDT) MIME-Version: 1.0 From: Nicolas Odermatt-Lemay Date: Sun, 26 May 2024 22:13:26 -0400 Message-ID: Content-Type: multipart/alternative; boundary="000000000000a7baee0619661084" Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=nodermattlemay@gmail.com; helo=mail-pj1-x1030.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 2.46 X-Migadu-Queue-Id: 4E994268C2 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 2.46 X-TUID: fxwP//tJg0p7 --000000000000a7baee0619661084 Content-Type: text/plain; charset="UTF-8" Hello, 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. 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))))) (if (and stow? packages (maybe-value-set? packages)) (append-map filter-files (map (lambda (pkg) --000000000000a7baee0619661084 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

While attempting= to setup home-dotfiles-service, I noticed that some files were being symli= nked even though they were in the variable `%home-dotfiles-excluded', s= uch as all the files of the .git directory.

T= his patch seems to fix the problem :

diff --git a/= gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.scm
index 82= 3bdb03fb..38f7ff83d0 100644
--- a/gnu/home/services/dotfiles.scm
+++ = b/gnu/home/services/dotfiles.scm
@@ -45,7 +45,7 @@ (define-module (gnu h= ome services dotfiles)
=C2=A0(define %home-dotfiles-excluded
=C2=A0 = =C2=A0'(".*~"
=C2=A0 =C2=A0 =C2=A0".*\\.swp"
= - =C2=A0 =C2=A0"\\.git"
+ =C2=A0 =C2=A0"\\.git/.*"=C2=A0 =C2=A0 =C2=A0"\\.gitignore"))
=C2=A0
=C2=A0(define= %home-dotfiles-layouts
@@ -138,8 +138,7 @@ (define* (directory-contents= directory #:key (packages #f))
=C2=A0 =C2=A0 =C2=A0(define (filter-file= s directory)
=C2=A0 =C2=A0 =C2=A0 =C2=A0(find-files directory
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda (file= stat)
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(not (regexp-exec exclusion-rx
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(basename file))))))
+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(not (regexp-exec exclusion= -rx file)))))
=C2=A0 =C2=A0 =C2=A0(if (and stow? packages (maybe-value-s= et? packages))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(append-map filter-file= s
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(map (lambda (pkg)
--000000000000a7baee0619661084--