mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
database: Reset timestamps to one second after the Epoch.
Previously, store items registered in the database by this code (for instance, store items retrieved by 'guix offload' and passed to 'restore-file-set') would have an mtime of 0 instead of 1. This would cause problems for things like .go files: Guile would consider them to be older than the corresponding .scm file, and consequently it would ignore them and possibly use another (incorrect) .go file. Reported by Ricardo Wurmus. * guix/store/database.scm (reset-timestamps): Pass 1, not 0, to 'utime'. * tests/store-database.scm ("register-path"): Check the mtime of FILE and REF.
This commit is contained in:
parent
4f89a8eec6
commit
e475211869
2 changed files with 10 additions and 5 deletions
|
@ -190,12 +190,14 @@ (define* (sqlite-register db #:key path (references '())
|
|||
(define (reset-timestamps file)
|
||||
"Reset the modification time on FILE and on all the files it contains, if
|
||||
it's a directory. While at it, canonicalize file permissions."
|
||||
;; 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)
|
||||
(utime file 0 0 0 0)
|
||||
(utime file 1 1 0 0)
|
||||
(let ((parent file))
|
||||
(for-each (match-lambda
|
||||
(("." . _) #f)
|
||||
|
@ -209,10 +211,10 @@ (define (reset-timestamps file)
|
|||
(type type))))))
|
||||
(scandir* parent))))
|
||||
((symlink)
|
||||
(utime file 0 0 0 0 AT_SYMLINK_NOFOLLOW))
|
||||
(utime file 1 1 0 0 AT_SYMLINK_NOFOLLOW))
|
||||
(else
|
||||
(chmod file (if (executable-file? file) #o555 #o444))
|
||||
(utime file 0 0 0 0)))))
|
||||
(utime file 1 1 0 0)))))
|
||||
|
||||
(define* (register-path path
|
||||
#:key (references '()) deriver prefix
|
||||
|
|
|
@ -32,7 +32,8 @@ (define %store
|
|||
|
||||
(test-begin "store-database")
|
||||
|
||||
(test-assert "register-path"
|
||||
(test-equal "register-path"
|
||||
'(1 1)
|
||||
(let ((file (string-append (%store-prefix) "/" (make-string 32 #\f)
|
||||
"-fake")))
|
||||
(when (valid-path? %store file)
|
||||
|
@ -50,7 +51,9 @@ (define %store
|
|||
(and (valid-path? %store file)
|
||||
(equal? (references %store file) (list ref))
|
||||
(null? (valid-derivers %store file))
|
||||
(null? (referrers %store file))))))
|
||||
(null? (referrers %store file))
|
||||
(list (stat:mtime (lstat file))
|
||||
(stat:mtime (lstat ref)))))))
|
||||
|
||||
(test-equal "new database"
|
||||
(list 1 2)
|
||||
|
|
Loading…
Reference in a new issue