aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-02-22 23:38:46 +0100
committerLudovic Courtès <ludo@gnu.org>2021-02-22 23:42:08 +0100
commit11f11d7ecb817d1421f8b5340bcced59396d8708 (patch)
treefc9f0be71e34ca604272cca72de010e3d33fb190
parente8fc373900cb3c1ee14db7a88ea6efbfdc810269 (diff)
downloadguix-11f11d7ecb817d1421f8b5340bcced59396d8708.tar
guix-11f11d7ecb817d1421f8b5340bcced59396d8708.tar.gz
scripts: Don't trigger option hints for short options.
Previously, 'guix install foo -r bar' would crash with a backtrace because NAME would be #\r (a character instead of a string). * guix/scripts.scm (parse-command-line)[parse-options-from]: Call 'option-hint' only when NAME is a string.
-rw-r--r--guix/scripts.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts.scm b/guix/scripts.scm
index c9ea9f2e29..0c896a2b8c 100644
--- a/guix/scripts.scm
+++ b/guix/scripts.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020, 2021, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@@ -157,7 +157,8 @@ parameter of 'args-fold'."
;; Actual parsing takes place here.
(apply args-fold* args options
(lambda (opt name arg . rest)
- (let ((hint (option-hint name options)))
+ (let ((hint (and (string? name) ;not a short option
+ (option-hint name options))))
(report-error (G_ "~A: unrecognized option~%") name)
(when hint
(display-hint