From cd6c5ddfc8a1a0a6f4085c8201fca20fd819bdfd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 11 Dec 2020 10:37:06 +0100
Subject: 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'.
---
 guix/build/store-copy.scm | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'guix/build')

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)))))
 
-- 
cgit v1.2.3