mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
database: Remove #:deduplicate? from 'register-items'.
It is now up to the caller to deduplicate store contents. * guix/store/database.scm (register-items): Remove #:deduplicate? parameter and call to 'deduplicate'. (register-path): Call 'deduplicate' when #:deduplicate? is true. * gnu/build/image.scm (register-closure): Adjust call accordingly. * gnu/build/vm.scm (register-closure): Likewise. * guix/nar.scm (finalize-store-file): Likewise. * guix/scripts/pack.scm (store-database): Likewise.
This commit is contained in:
parent
2aa512ec28
commit
0793833c59
5 changed files with 7 additions and 10 deletions
|
@ -151,7 +151,6 @@ produced by #:references-graphs. Pass WAL-MODE? to call-with-database."
|
||||||
#:wal-mode? wal-mode?
|
#:wal-mode? wal-mode?
|
||||||
(register-items db items
|
(register-items db items
|
||||||
#:prefix prefix
|
#:prefix prefix
|
||||||
#:deduplicate? #f
|
|
||||||
#:registration-time %epoch)))))
|
#:registration-time %epoch)))))
|
||||||
|
|
||||||
(define* (initialize-efi-partition root
|
(define* (initialize-efi-partition root
|
||||||
|
|
|
@ -224,7 +224,6 @@ produced by #:references-graphs."
|
||||||
(with-database (store-database-file #:prefix prefix) db
|
(with-database (store-database-file #:prefix prefix) db
|
||||||
(register-items db items
|
(register-items db items
|
||||||
#:prefix prefix
|
#:prefix prefix
|
||||||
#:deduplicate? #f
|
|
||||||
#:registration-time %epoch)))))
|
#:registration-time %epoch)))))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -118,8 +118,7 @@ held."
|
||||||
;; Register TARGET. The 'restore-file' call took care of
|
;; Register TARGET. The 'restore-file' call took care of
|
||||||
;; deduplication, timestamps, and permissions.
|
;; deduplication, timestamps, and permissions.
|
||||||
(register-items db
|
(register-items db
|
||||||
(list (store-info target deriver references))
|
(list (store-info target deriver references))))
|
||||||
#:deduplicate? #f))
|
|
||||||
|
|
||||||
(when lock?
|
(when lock?
|
||||||
(delete-file (string-append target ".lock"))
|
(delete-file (string-append target ".lock"))
|
||||||
|
|
|
@ -167,7 +167,6 @@ dependencies are registered."
|
||||||
(let ((items (append-map read-closure '#$labels)))
|
(let ((items (append-map read-closure '#$labels)))
|
||||||
(with-database db-file db
|
(with-database db-file db
|
||||||
(register-items db items
|
(register-items db items
|
||||||
#:deduplicate? #f
|
|
||||||
#:registration-time %epoch)))))))
|
#:registration-time %epoch)))))))
|
||||||
|
|
||||||
(computed-file "store-database" build
|
(computed-file "store-database" build
|
||||||
|
|
|
@ -407,6 +407,11 @@ by adding it as a temp-root."
|
||||||
(define real-file-name
|
(define real-file-name
|
||||||
(string-append (or prefix "") path))
|
(string-append (or prefix "") path))
|
||||||
|
|
||||||
|
(when deduplicate?
|
||||||
|
(deduplicate real-file-name (nar-sha256 real-file-name)
|
||||||
|
#:store (string-append (or prefix "")
|
||||||
|
%store-directory)))
|
||||||
|
|
||||||
(when reset-timestamps?
|
(when reset-timestamps?
|
||||||
(reset-timestamps real-file-name))
|
(reset-timestamps real-file-name))
|
||||||
|
|
||||||
|
@ -414,7 +419,6 @@ by adding it as a temp-root."
|
||||||
(with-database db-file db
|
(with-database db-file db
|
||||||
(register-items db (list (store-info path deriver references))
|
(register-items db (list (store-info path deriver references))
|
||||||
#:prefix prefix
|
#:prefix prefix
|
||||||
#:deduplicate? deduplicate?
|
|
||||||
#:log-port (%make-void-port "w")))))
|
#:log-port (%make-void-port "w")))))
|
||||||
|
|
||||||
(define %epoch
|
(define %epoch
|
||||||
|
@ -423,7 +427,6 @@ by adding it as a temp-root."
|
||||||
|
|
||||||
(define* (register-items db items
|
(define* (register-items db items
|
||||||
#:key prefix
|
#:key prefix
|
||||||
(deduplicate? #t)
|
|
||||||
registration-time
|
registration-time
|
||||||
(log-port (current-error-port)))
|
(log-port (current-error-port)))
|
||||||
"Register all of ITEMS, a list of <store-info> records as returned by
|
"Register all of ITEMS, a list of <store-info> records as returned by
|
||||||
|
@ -467,9 +470,7 @@ typically by adding them as temp-roots."
|
||||||
"sha256:"
|
"sha256:"
|
||||||
(bytevector->base16-string hash))
|
(bytevector->base16-string hash))
|
||||||
#:nar-size nar-size
|
#:nar-size nar-size
|
||||||
#:time registration-time)))
|
#:time registration-time))))))
|
||||||
(when deduplicate?
|
|
||||||
(deduplicate real-file-name hash #:store store-dir)))))
|
|
||||||
|
|
||||||
(let* ((prefix (format #f "registering ~a items" (length items)))
|
(let* ((prefix (format #f "registering ~a items" (length items)))
|
||||||
(progress (progress-reporter/bar (length items)
|
(progress (progress-reporter/bar (length items)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue