summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorSimon Tournier <zimon.toutoune@gmail.com>2021-01-07 18:08:47 +0100
committerRicardo Wurmus <rekado@elephly.net>2021-01-07 18:10:58 +0100
commita0f019b81f9e58bc1290a0d7426cc9558fbed568 (patch)
tree7a10664da832636b54afe7af05b45e88f0bed25a /guix
parentd033540e6c113323089403a26e39f9a288c9c857 (diff)
ui: Fix order of match clauses.
Fixes <https://bugs.gnu.org/45709>. This is a follow-up to commit cf289d7cfa34315bf13b3114b9a5bf3d3c05ebea. * guix/ui.scm (run-guix-command): Match for #false first. Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
Diffstat (limited to 'guix')
-rw-r--r--guix/ui.scm10
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 7f52518023..bd504c68da 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2019, 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -2133,11 +2133,11 @@ found."
(lambda ()
(match (search-path (extension-directories)
(format #f "~a.scm" command))
+ (#f
+ (throw 'misc-error))
(file
- (load file)
- (resolve-interface `(guix extensions ,command)))
- (_
- (throw 'misc-error))))
+ (load file)
+ (resolve-interface `(guix extensions ,command)))))
(lambda _
(format (current-error-port)
(G_ "guix: ~a: command not found~%") command)