guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/16: home: symlink-manager: Use 'file-is-directory?'.


From: guix-commits
Subject: 08/16: home: symlink-manager: Use 'file-is-directory?'.
Date: Thu, 10 Mar 2022 05:43:54 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit e1b38046a6eadd2a3a8f1597330cf688904bd41b
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Fri Feb 18 17:02:46 2022 +0100

    home: symlink-manager: Use 'file-is-directory?'.
    
    * 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 @@ appear only after all nested items already listed."
          (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 @@ appear only after all nested items already listed."
                 (('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 @@ appear only after all nested items already listed."
                 (('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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]