diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-11 10:37:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-15 17:32:11 +0100 |
| commit | cd6c5ddfc8a1a0a6f4085c8201fca20fd819bdfd (patch) | |
| tree | e8738652d1e1cb5ffa4e670df47331f73fa7331b /guix/build | |
| parent | 0793833c59e727d5d471fe46c8e0e44c811b9621 (diff) | |
guix system: 'init' copies, resets timestamps, and deduplicates at once.
Partly fixes <https://bugs.gnu.org/44760>.
* guix/build/store-copy.scm (copy-store-item): New procedure.
(populate-store): Use it instead of the inline 'copy-recursively' call.
* guix/scripts/system.scm (copy-item): Likewise.
Pass #:reset-timestamps? and #:deduplicate? to 'register-path'.
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/store-copy.scm | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/guix/build/store-copy.scm b/guix/build/store-copy.scm index 7f0672cd9d..01e1f41870 100644 --- a/guix/build/store-copy.scm +++ b/guix/build/store-copy.scm @@ -38,6 +38,7 @@ file-size closure-size + copy-store-item populate-store)) ;;; Commentary: @@ -242,6 +243,24 @@ permissions. Write verbose output to the LOG port." stat lstat))) +(define* (copy-store-item item target + #:key + (deduplicate? #t) + (log-port (%make-void-port "w"))) + "Copy ITEM, a store item, to the store under TARGET, the target root +directory. When DEDUPLICATE? is true, deduplicate it within TARGET." + (define store + (string-append target (%store-directory))) + + (copy-recursively item (string-append target item) + #:keep-mtime? #t + #:keep-permissions? #t + #:copy-file + (if deduplicate? + (cut copy-file/deduplicate <> <> #:store store) + copy-file) + #:log log-port)) + (define* (populate-store reference-graphs target #:key (deduplicate? #t) @@ -273,16 +292,8 @@ regular files as they are copied to TARGET." (call-with-progress-reporter progress (lambda (report) (for-each (lambda (thing) - (copy-recursively thing - (string-append target thing) - #:keep-mtime? #t - #:keep-permissions? #t - #:copy-file - (if deduplicate? - (cut copy-file/deduplicate <> <> - #:store store) - copy-file) - #:log (%make-void-port "w")) + (copy-store-item thing target + #:deduplicate? deduplicate?) (report)) things))))) |