ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: Fix order of match clauses.

Browse source 
Fixes <https://bugs.gnu.org/45709>.

This is a follow-up to commit cf289d7cfa.

* guix/ui.scm (run-guix-command): Match for #false first.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
Simon Tournier 2021-01-07 18:08:47 +01:00 committed by Ricardo Wurmus
parent d033540e6c
commit a0f019b81f
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/ui.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; 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 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -2133,11 +2133,11 @@ (define module
(lambda () (lambda ()
(match (search-path (extension-directories) (match (search-path (extension-directories)
(format #f "~a.scm" command)) (format #f "~a.scm" command))
(#f
(throw 'misc-error))
(file (file
(load file) (load file)
(resolve-interface `(guix extensions ,command))) (resolve-interface `(guix extensions ,command)))))
(_
(throw 'misc-error))))
(lambda _ (lambda _
(format (current-error-port) (format (current-error-port)
(G_ "guix: ~a: command not found~%") command) (G_ "guix: ~a: command not found~%") command)