me/guix
Archived
1
0
Fork 0
Code Activity

image: 'register-closure' assumes already-reset timestamps.

Browse source 
* gnu/build/image.scm (register-closure): Remove #:reset-timestamps?
parameter.  Pass #:reset-timestamps? #f to 'register-items'.
(initialize-root-partition): Adjust accordingly.
* gnu/build/vm.scm (register-closure, root-partition-initializer):
Likewise.
This commit is contained in:
Ludovic Courtès 2020-12-10 14:01:03 +01:00
parent 7b8d239ec2
commit 0f15fd5c12
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/build/image.scm
View file

@ -140,13 +140,12 @@ given CONFIG file."
(define* (register-closure prefix closure (define* (register-closure prefix closure
#:key #:key
(deduplicate? #t) (reset-timestamps? #t) (deduplicate? #t)
(schema (sql-schema)) (schema (sql-schema))
(wal-mode? #t)) (wal-mode? #t))
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the "Register CLOSURE in PREFIX, where PREFIX is the directory name of the
target store and CLOSURE is the name of a file containing a reference graph as target store and CLOSURE is the name of a file containing a reference graph as
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is produced by #:references-graphs. As a side effect, if DEDUPLICATE? is true,
true, reset timestamps on store files and, if DEDUPLICATE? is true,
deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE? deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE?
to call-with-database." to call-with-database."
(let ((items (call-with-input-file closure read-reference-graph))) (let ((items (call-with-input-file closure read-reference-graph)))
@ -156,7 +155,7 @@ to call-with-database."
(register-items db items (register-items db items
#:prefix prefix #:prefix prefix
#:deduplicate? deduplicate? #:deduplicate? deduplicate?
#:reset-timestamps? reset-timestamps? #:reset-timestamps? #f
#:registration-time %epoch))))) #:registration-time %epoch)))))
(define* (initialize-efi-partition root (define* (initialize-efi-partition root
@ -197,7 +196,6 @@ register-closure."
(when register-closures? (when register-closures?
(for-each (lambda (closure) (for-each (lambda (closure)
(register-closure root closure (register-closure root closure
#:reset-timestamps? #f
#:deduplicate? deduplicate? #:deduplicate? deduplicate?
#:wal-mode? wal-mode?)) #:wal-mode? wal-mode?))
references-graphs)) references-graphs))

8
gnu/build/vm.scm
View file

@ -215,12 +215,11 @@ the #:references-graphs parameter of 'derivation'."
(define* (register-closure prefix closure (define* (register-closure prefix closure
#:key #:key
(deduplicate? #t) (reset-timestamps? #t) (deduplicate? #t)
(schema (sql-schema))) (schema (sql-schema)))
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the "Register CLOSURE in PREFIX, where PREFIX is the directory name of the
target store and CLOSURE is the name of a file containing a reference graph as target store and CLOSURE is the name of a file containing a reference graph as
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is produced by #:references-graphs. As a side effect, if DEDUPLICATE? is true,
true, reset timestamps on store files and, if DEDUPLICATE? is true,
deduplicates files common to CLOSURE and the rest of PREFIX." deduplicates files common to CLOSURE and the rest of PREFIX."
(let ((items (call-with-input-file closure read-reference-graph))) (let ((items (call-with-input-file closure read-reference-graph)))
(parameterize ((sql-schema schema)) (parameterize ((sql-schema schema))
@ -228,7 +227,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX."
(register-items db items (register-items db items
#:prefix prefix #:prefix prefix
#:deduplicate? deduplicate? #:deduplicate? deduplicate?
#:reset-timestamps? reset-timestamps? #:reset-timestamps? #f
#:registration-time %epoch))))) #:registration-time %epoch)))))
@ -414,7 +413,6 @@ system that is passed to 'populate-root-file-system'."
(for-each (lambda (closure) (for-each (lambda (closure)
(register-closure target (register-closure target
(string-append "/xchg/" closure) (string-append "/xchg/" closure)
#:reset-timestamps? #f
#:deduplicate? deduplicate?)) #:deduplicate? deduplicate?))
closures) closures)
(unless copy-closures? (unless copy-closures?