kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

copy: Use 'with-build-handler'.

Browse Source 
* guix/scripts/copy.scm (send-to-remote-host): Remove explicit
'show-what-to-build' call.  Call 'build-derivations' unconditionally.
(guix-copy): Wrap 'with-status-verbosity' in 'with-build-handler'.
This commit is contained in:
Ludovic Courtès 2020-03-22 12:26:05 +01:00
parent 81c0b52bd6
commit 3e6f65be7a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/scripts/copy.scm
View File

@ -68,12 +68,7 @@ package names, build the underlying packages before sending them."
(ssh-spec->user+host+port target)) (ssh-spec->user+host+port target))
((drv items) ((drv items)
(options->derivations+files local opts))) (options->derivations+files local opts)))
(show-what-to-build local drv (and (build-derivations local drv)
#:use-substitutes? (assoc-ref opts 'substitutes?)
#:dry-run? (assoc-ref opts 'dry-run?))
(and (or (assoc-ref opts 'dry-run?)
(build-derivations local drv))
(let* ((session (open-ssh-session host #:user user (let* ((session (open-ssh-session host #:user user
#:port (or port 22))) #:port (or port 22)))
(sent (send-files local items (sent (send-files local items
@ -178,7 +173,11 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(target (assoc-ref opts 'destination))) (target (assoc-ref opts 'destination)))
(with-store store (with-store store
(set-build-options-from-command-line store opts) (set-build-options-from-command-line store opts)
(with-build-handler (build-notifier #:use-substitutes?
(assoc-ref opts 'substitutes?)
#:dry-run?
(assoc-ref opts 'dry-run?))
(with-status-verbosity (assoc-ref opts 'verbosity) (with-status-verbosity (assoc-ref opts 'verbosity)
(cond (target (send-to-remote-host store target opts)) (cond (target (send-to-remote-host store target opts))
(source (retrieve-from-remote-host store source opts)) (source (retrieve-from-remote-host store source opts))
(else (leave (G_ "use '--to' or '--from'~%"))))))))) (else (leave (G_ "use '--to' or '--from'~%"))))))))))