summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-11-15 21:30:37 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-15 23:28:17 +0100
commit1edcfda81ba5c20ca715473d45315662c60dd81e (patch)
tree64dbd3b94be5af95f3ef8163cd3ab4c633757a2b
parent6f160c5c3809c9fd7af7da3f215ca0222e24ccce (diff)
downloadguix-1edcfda81ba5c20ca715473d45315662c60dd81e.tar.gz
pull: Remove unused '--verbose' option.
This option had been ignored since commit
0d39a3b98948314e135566b9315717695a9035ea (August 2018).

* guix/scripts/pull.scm (show-help, %options): Remove "--verbose".
(build-and-install): Remove #:verbose?, which was unused.
(guix-pull): Adjust accordingly.
-rw-r--r--guix/scripts/pull.scm13
1 files changed, 3 insertions, 10 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 92aac6066e..418998409a 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -79,8 +79,6 @@
   (display (G_ "Usage: guix pull [OPTION]...
 Download and deploy the latest version of Guix.\n"))
   (display (G_ "
-      --verbose          produce verbose output"))
-  (display (G_ "
   -C, --channels=FILE    deploy the channels defined in FILE"))
   (display (G_ "
       --url=URL          download from the Git repository at URL"))
@@ -120,10 +118,7 @@ Download and deploy the latest version of Guix.\n"))
 
 (define %options
   ;; Specifications of the command-line options.
-  (cons* (option '("verbose") #f #f
-                 (lambda (opt name arg result)
-                   (alist-cons 'verbose? #t result)))
-         (option '(#\C "channels") #t #f
+  (cons* (option '(#\C "channels") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'channel-file arg result)))
          (option '(#\l "list-generations") #f #t
@@ -382,7 +377,7 @@ previous generation.  Return true if there are news to display."
   (display-channel-news profile))
 
 (define* (build-and-install instances profile
-                            #:key use-substitutes? verbose? dry-run?)
+                            #:key use-substitutes? dry-run?)
   "Build the tool from SOURCE, and install it in PROFILE.  When DRY-RUN? is
 true, display what would be built without actually building it."
   (define update-profile
@@ -823,8 +818,6 @@ Use '~/.config/guix/channels.scm' instead."))
                                              #:dry-run?
                                              (assoc-ref opts 'dry-run?)
                                              #:use-substitutes?
-                                             (assoc-ref opts 'substitutes?)
-                                             #:verbose?
-                                             (assoc-ref opts 'verbose?))))))))))))))
+                                             (assoc-ref opts 'substitutes?))))))))))))))
 
 ;;; pull.scm ends here