nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

copy: Add '--verbosity'. 

This fixes a regression introduced in
f1de676ea8 since %DEFAULT-OPTIONS was
missing the 'debug key that 'set-build-options-from-command-line'
expects.

* guix/scripts/copy.scm (show-help, %options): Add '--verbosity'.
(%default-options): Rename 'verbosity' to 'debug'.  Add
'print-build-trace?', 'print-extended-build-trace?',
'multiplexed-build-output?', and 'verbosity'.
(guix-copy): Wrap body in 'with-status-verbosity'.
This commit is contained in:
Ludovic Courtès 2019-01-14 23:41:30 +01:00
parent e98c354d1a
commit 0ee1e47edb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
guix/scripts/copy.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,6 +21,7 @@
#:use-module (guix scripts) #:use-module (guix scripts)
#:use-module (guix ssh) #:use-module (guix ssh)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix scripts build) #:use-module (guix scripts build)
@ -116,6 +117,8 @@ Copy ITEMS to or from the specified host over SSH.\n"))
--to=HOST send ITEMS to HOST")) --to=HOST send ITEMS to HOST"))
(display (G_ " (display (G_ "
--from=HOST receive ITEMS from HOST")) --from=HOST receive ITEMS from HOST"))
(display (G_ "
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
(newline) (newline)
(show-build-options-help) (show-build-options-help)
(newline) (newline)
@ -134,6 +137,11 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(option '("from") #t #f (option '("from") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'source arg result))) (alist-cons 'source arg result)))
(option '(#\v "verbosity") #t #f
(lambda (opt name arg result)
(let ((level (string->number* arg)))
(alist-cons 'verbosity level
(alist-delete 'verbosity result)))))
(option '(#\h "help") #f #f (option '(#\h "help") #f #f
(lambda args (lambda args
(show-help) (show-help)
@ -152,7 +160,11 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(substitutes? . #t) (substitutes? . #t)
(build-hook? . #t) (build-hook? . #t)
(graft? . #t) (graft? . #t)
(verbosity . 0))) (print-build-trace? . #t)
(print-extended-build-trace? . #t)
(multiplexed-build-output? . #t)
(debug . 0)
(verbosity . 2)))
;;; ;;;
@ -164,6 +176,7 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(let* ((opts (parse-command-line args %options (list %default-options))) (let* ((opts (parse-command-line args %options (list %default-options)))
(source (assoc-ref opts 'source)) (source (assoc-ref opts 'source))
(target (assoc-ref opts 'destination))) (target (assoc-ref opts 'destination)))
(cond (target (send-to-remote-host target opts)) (with-status-verbosity (assoc-ref opts 'verbosity)
(source (retrieve-from-remote-host source opts)) (cond (target (send-to-remote-host target opts))
(else (leave (G_ "use '--to' or '--from'~%"))))))) (source (retrieve-from-remote-host source opts))
(else (leave (G_ "use '--to' or '--from'~%"))))))))