[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: database: 'reset-timestamps' can optionally preserve permissions.
From: |
guix-commits |
Subject: |
04/07: database: 'reset-timestamps' can optionally preserve permissions. |
Date: |
Mon, 6 Apr 2020 13:33:24 -0400 (EDT) |
civodul pushed a commit to branch wip-hurd-vm
in repository guix.
commit 2d3bd4c788128884b5917333769c6c68011550b9
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 6 15:40:30 2020 +0200
database: 'reset-timestamps' can optionally preserve permissions.
* guix/store/database.scm (reset-timestamps): Add
#:preserve-permissions? and honor it.
---
guix/store/database.scm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/guix/store/database.scm b/guix/store/database.scm
index 88d05dc..ef52036 100644
--- a/guix/store/database.scm
+++ b/guix/store/database.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019 Caleb Ristvedt <address@hidden>
-;;; Copyright © 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2018, 2020 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -228,16 +228,18 @@ Every store item in REFERENCES must already be
registered."
;;; High-level interface.
;;;
-(define (reset-timestamps file)
+(define* (reset-timestamps file #:key preserve-permissions?)
"Reset the modification time on FILE and on all the files it contains, if
-it's a directory. While at it, canonicalize file permissions."
+it's a directory. Canonicalize file permissions unless PRESERVE-PERMISSIONS?
+is true."
;; Note: We're resetting to one second after the Epoch like 'guix-daemon'
;; has always done.
(let loop ((file file)
(type (stat:type (lstat file))))
(case type
((directory)
- (chmod file #o555)
+ (unless preserve-permissions?
+ (chmod file #o555))
(utime file 1 1 0 0)
(let ((parent file))
(for-each (match-lambda
@@ -254,7 +256,8 @@ it's a directory. While at it, canonicalize file
permissions."
((symlink)
(utime file 1 1 0 0 AT_SYMLINK_NOFOLLOW))
(else
- (chmod file (if (executable-file? file) #o555 #o444))
+ (unless preserve-permissions?
+ (chmod file (if (executable-file? file) #o555 #o444)))
(utime file 1 1 0 0)))))
(define* (register-path path
- branch wip-hurd-vm updated (3a6eb2c -> eef7e0f), guix-commits, 2020/04/06
- 01/07: squash! DRAFT: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/06
- 02/07: gnu: hurd: Install the UTF-8 motd., guix-commits, 2020/04/06
- 03/07: system: hurd: Create /etc/{hostname,motd,login} and /root., guix-commits, 2020/04/06
- 04/07: database: 'reset-timestamps' can optionally preserve permissions.,
guix-commits <=
- 05/07: vm: Preserve file permissions on /dev., guix-commits, 2020/04/06
- 06/07: squash! gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/06
- 07/07: linux-boot: 'make-essential-device-nodes' root parameter is optional., guix-commits, 2020/04/06