summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-12-05 16:46:47 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-12-05 16:47:59 +0100
commit4d0b61a1f6ff99ff1795b876841e84e136b05186 (patch)
tree33d0db6a55c5b4e7f9f98f3326f19e2e0f50334f
parentcebfb29abb151ede95696181d2446c63504593d7 (diff)
downloadguix-4d0b61a1f6ff99ff1795b876841e84e136b05186.tar.gz
pull: Accept no non-option arguments.
* guix/scripts/pull.scm (guix-pull): LEAVE if any non-option arguments
were passed.
-rw-r--r--guix/scripts/pull.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 7fd8b3f1a4..83cdc1d1eb 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -754,10 +755,14 @@ Use '~/.config/guix/channels.scm' instead."))
 (define-command (guix-pull . args)
   (synopsis "pull the latest revision of Guix")
 
+  (define (no-arguments arg _‌)
+    (leave (G_ "~A: extraneous argument~%") arg))
+
   (with-error-handling
     (with-git-error-handling
      (let* ((opts         (parse-command-line args %options
-                                              (list %default-options)))
+                                              (list %default-options)
+                                              #:argument-handler no-arguments))
             (substitutes? (assoc-ref opts 'substitutes?))
             (dry-run?     (assoc-ref opts 'dry-run?))
             (channels     (channel-list opts))