database: 'reset-timestamps' sets file permissions as well.

* guix/store/database.scm (reset-timestamps): Add 'chmod' calls.
This commit is contained in:
Ludovic Courtès 2018-06-06 22:53:52 +02:00
parent 122a6cad7d
commit 49c393ccaa
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -24,7 +24,8 @@ (define-module (guix store database)
#:use-module (guix store deduplication)
#:use-module (guix base16)
#:use-module (guix build syscalls)
#:use-module ((guix build utils) #:select (mkdir-p))
#:use-module ((guix build utils)
#:select (mkdir-p executable-file?))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-19)
@ -189,11 +190,12 @@ (define* (sqlite-register #:key db-file path (references '())
;; TODO: Factorize with that in (gnu build install).
(define (reset-timestamps file)
"Reset the modification time on FILE and on all the files it contains, if
it's a directory."
it's a directory. While at it, canonicalize file permissions."
(let loop ((file file)
(type (stat:type (lstat file))))
(case type
((directory)
(chmod file #o555)
(utime file 0 0 0 0)
(let ((parent file))
(for-each (match-lambda
@ -212,16 +214,9 @@ (define (reset-timestamps file)
;; symlinks.
#f)
(else
(chmod file (if (executable-file? file) #o555 #o444))
(utime file 0 0 0 0)))))
;; TODO: make this canonicalize store items that are registered. This involves
;; setting permissions and timestamps, I think. Also, run a "deduplication
;; pass", whatever that involves. Also, handle databases not existing yet
;; (what should the default behavior be? Figuring out how the C++ stuff
;; currently does it sounds like a lot of grepping for global
;; variables...). Also, return #t on success like the documentation says we
;; should.
(define* (register-path path
#:key (references '()) deriver prefix
state-directory (deduplicate? #t)