01/16: database: 'reset-timestamps' can optionally preserve permissions.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 7fa6155b2396224360660c255b89865d065c9f96
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