[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' cal
From: |
Ludovic Courtès |
Subject: |
[bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call. |
Date: |
Sun, 27 Feb 2022 14:53:36 +0100 |
* gnu/home/services/symlink-manager.scm
(update-symlinks-script)[symlink-to-store?]:
Avoid extra 'lstat' call.
---
gnu/home/services/symlink-manager.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/home/services/symlink-manager.scm
b/gnu/home/services/symlink-manager.scm
index 6b3a9de3d1..ba42424e8e 100644
--- a/gnu/home/services/symlink-manager.scm
+++ b/gnu/home/services/symlink-manager.scm
@@ -103,8 +103,13 @@ (define (get-backup-path path)
(string-append backup-dir "/." path))
(define (symlink-to-store? path)
- (and (equal? (stat:type (lstat path)) 'symlink)
- (store-file-name? (readlink path))))
+ (catch 'system-error
+ (lambda ()
+ (store-file-name? (readlink path)))
+ (lambda args
+ (if (= EINVAL (system-error-errno args))
+ #f
+ (apply throw args)))))
(define (backup-file path)
(mkdir-p backup-dir)
--
2.34.0
- [bug#54180] [PATCH 00/12] Home: Clarify and better test symlink-manager.scm, Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 01/12] home: symlink-manager: Clarify module imports., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 03/12] home: symlink-manager: Use 'for-each' when used for effects., Ludovic Courtès, 2022/02/27
- [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 <=
- [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, 2022/02/27
- [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