[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54180] [PATCH 04/12] home: symlink-manager: Use 'file-is-directory?
From: |
Ludovic Courtès |
Subject: |
[bug#54180] [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
- [bug#54180] [PATCH 02/12] home: symlink-manager: Move helper procedures as top-level defines., (continued)
- [bug#54180] [PATCH 02/12] home: symlink-manager: Move helper procedures as top-level defines., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 12/12] home: symlink-manager: Rename "path" to "file" where appropriate., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 07/12] tests: Make sure 'guix home reconfigure' backs up files., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 11/12] home: symlink-manager: 'create-symlinks' uses 'file-system-fold'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 05/12] home: symlink-manager: Remove 'empty-directory?' and avoid TOCTTOU race., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 04/12] home: symlink-manager: Use 'file-is-directory?'.,
Ludovic Courtès <=
- [bug#54180] [PATCH 08/12] tests: Simplify use of 'local-file' in 'tests/guix-home.sh'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 10/12] home: symlink-manager: 'cleanup-symlinks' uses 'file-system-fold'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 09/12] tests: Check 'guix home reconfigure' for a second generation., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 00/12] Home: Clarify and better test symlink-manager.scm, Andrew Tropin, 2022/02/28