GNU bug report logs - #54180
[PATCH 00/12] Home: Clarify and better test symlink-manager.scm

Previous Next

Full log

Message #38 received at 54180 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 54180 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 04/12] home: symlink-manager: Use 'file-is-directory?'.
Date: Sun, 27 Feb 2022 14:53:34 +0100

* gnu/home/services/symlink-manager.scm (update-symlinks-script)[directory?]:
Remove.
Change callers to use 'file-is-directory?' instead.
---
 gnu/home/services/symlink-manager.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm
index a6344c808f..f133eb17f2 100644
--- a/gnu/home/services/symlink-manager.scm
+++ b/gnu/home/services/symlink-manager.scm
@@ -101,9 +101,6 @@ (define (get-target-path path)
          (define (get-backup-path path)
            (string-append backup-dir "/." path))
 
-         (define (directory? path)
-           (equal? (stat:type (stat path)) 'directory))
-
          (define (empty-directory? dir)
            (equal? (scandir dir) '("." "..")))
 
@@ -133,7 +130,7 @@ (define (cleanup-symlinks old-tree)
                 (('dir . path)
                  (if (and
                       (file-exists? (get-target-path path))
-                      (directory? (get-target-path path))
+                      (file-is-directory? (get-target-path path))
                       (empty-directory? (get-target-path path)))
                      (begin
                        (format #t (G_ "Removing ~a...")
@@ -179,7 +176,7 @@ (define (get-source-path path)
                 (('dir . path)
                  (let ((target-path (get-target-path path)))
                    (when (and (file-exists? target-path)
-                              (not (directory? target-path)))
+                              (not (file-is-directory? target-path)))
                      (backup-file path))
 
                    (if (file-exists? target-path)
-- 
2.34.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.