From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKPLu-0007mV-4x for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKPLo-00028R-3K for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:10 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57238) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eKPLn-00027w-Vs for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eKPLn-0000ic-NI for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:03 -0500 Subject: [bug#29509] [PATCH 5/6] guix system: Simplify closure copy. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 30 Nov 2017 14:57:01 +0100 Message-Id: <20171130135702.4321-5-ludo@gnu.org> In-Reply-To: <20171130135702.4321-1-ludo@gnu.org> References: <20171130135702.4321-1-ludo@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29509@debbugs.gnu.org * guix/scripts/system.scm (copy-item): Add 'references' argument and remove 'references*' call. Turn into a non-monadic procedure. (copy-closure): Remove initial call to 'references*'. Only pass ITEM to 'topologically-sorted*' since that's equivalent. Compute the list of references corresponding to TO-COPY and pass it to 'copy-item'. --- guix/scripts/system.scm | 61 +++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index e50f1d8ac..acfa5fdbf 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -107,47 +107,44 @@ BODY..., and restore them." (store-lift topologically-sorted)) -(define* (copy-item item target +(define* (copy-item item references target #:key (log-port (current-error-port))) - "Copy ITEM to the store under root directory TARGET and register it." - (mlet* %store-monad ((refs (references* item))) - (let ((dest (string-append target item)) - (state (string-append target "/var/guix"))) - (format log-port "copying '~a'...~%" item) + "Copy ITEM to the store under root directory TARGET and register it with +REFERENCES as its set of references." + (let ((dest (string-append target item)) + (state (string-append target "/var/guix"))) + (format log-port "copying '~a'...~%" item) - ;; Remove DEST if it exists to make sure that (1) we do not fail badly - ;; while trying to overwrite it (see ), and - ;; (2) we end up with the right contents. - (when (file-exists? dest) - (delete-file-recursively dest)) + ;; Remove DEST if it exists to make sure that (1) we do not fail badly + ;; while trying to overwrite it (see ), and + ;; (2) we end up with the right contents. + (when (file-exists? dest) + (delete-file-recursively dest)) - (copy-recursively item dest - #:log (%make-void-port "w")) + (copy-recursively item dest + #:log (%make-void-port "w")) - ;; Register ITEM; as a side-effect, it resets timestamps, etc. - ;; Explicitly use "TARGET/var/guix" as the state directory, to avoid - ;; reproducing the user's current settings; see - ;; . - (unless (register-path item - #:prefix target - #:state-directory state - #:references refs) - (leave (G_ "failed to register '~a' under '~a'~%") - item target)) - - (return #t)))) + ;; Register ITEM; as a side-effect, it resets timestamps, etc. + ;; Explicitly use "TARGET/var/guix" as the state directory, to avoid + ;; reproducing the user's current settings; see + ;; . + (unless (register-path item + #:prefix target + #:state-directory state + #:references references) + (leave (G_ "failed to register '~a' under '~a'~%") + item target)))) (define* (copy-closure item target #:key (log-port (current-error-port))) "Copy ITEM and all its dependencies to the store under root directory TARGET, and register them." - (mlet* %store-monad ((refs (references* item)) - (to-copy (topologically-sorted* - (delete-duplicates (cons item refs) - string=?)))) - (sequence %store-monad - (map (cut copy-item <> target #:log-port log-port) - to-copy)))) + (mlet* %store-monad ((to-copy (topologically-sorted* (list item))) + (refs (mapm %store-monad references* to-copy))) + (for-each (cut copy-item <> <> target #:log-port log-port) + to-copy refs) + + (return *unspecified*))) (define* (install-bootloader installer-drv #:key -- 2.15.0