* [bug#45714] [PATCH 0/1] Fix extension
@ 2021-01-07 14:12 zimoun
2021-01-07 14:15 ` [bug#45714] [PATCH 1/1] ui: Fix extensions zimoun
0 siblings, 1 reply; 3+ messages in thread
From: zimoun @ 2021-01-07 14:12 UTC (permalink / raw)
To: 45714
Dear,
Simple fix of bug#45709. The 'search-patch' function returns #f which breaks
the pattern matching. Another solution is 'let+if' instead of the 'match'.
http://issues.guix.gnu.org/issue/45709
All the best,
simon
zimoun (1):
ui: Fix extensions.
guix/ui.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
base-commit: 0d3f2716a8b8b64fc4126e1f3e987e05cb9f6bac
--
2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#45714] [PATCH 1/1] ui: Fix extensions.
2021-01-07 14:12 [bug#45714] [PATCH 0/1] Fix extension zimoun
@ 2021-01-07 14:15 ` zimoun
2021-01-07 17:13 ` bug#45714: " Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: zimoun @ 2021-01-07 14:15 UTC (permalink / raw)
To: 45714
Fixes <http://bugs.gnu.org/45709>.
* guix/ui.scm: (run-guix-command): Fix.
---
guix/ui.scm | 10 +++++-----
1 file 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)
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-07 17:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-07 14:12 [bug#45714] [PATCH 0/1] Fix extension zimoun
2021-01-07 14:15 ` [bug#45714] [PATCH 1/1] ui: Fix extensions zimoun
2021-01-07 17:13 ` bug#45714: " Ricardo Wurmus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).