From 50d5bb1f3e3f080212436db1b8666d061a8ae1d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 May 2021 11:02:07 +0200 Subject: git-download: 'git-predicate' now ignores deleted files. When git-predicate is used on an active worktree, some files in the index might not exist on the filesystem. Instead of failing with "No such file or directory", these should be ignored. * guix/git-download.scm (git-predicate): Wrap 'lstat' call in 'false-if-exception'. Return RESULT when STAT is #f. Co-authored-by: Andrew Whatson --- guix/git-download.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'guix/git-download.scm') diff --git a/guix/git-download.scm b/guix/git-download.scm index 199effece5..72084a2249 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -231,11 +231,13 @@ absolute file name and STAT is the result of 'lstat'." (lambda () (let* ((files (git-file-list directory)) (inodes (fold (lambda (file result) - (let ((stat - (lstat (string-append directory "/" - file)))) - (vhash-consv (stat:ino stat) (stat:dev stat) - result))) + (let* ((file (string-append directory "/" file)) + (stat (false-if-exception (lstat file)))) + ;; Ignore FILE if it has been deleted. + (if stat + (vhash-consv (stat:ino stat) (stat:dev stat) + result) + result))) vlist-null files))) (lambda (file stat) -- cgit v1.2.3