[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
42/68: installer: keymap: Fix keymap selection of layouts with not varia
From: |
guix-commits |
Subject: |
42/68: installer: keymap: Fix keymap selection of layouts with not variant. |
Date: |
Thu, 17 Jan 2019 08:05:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 9e58d4e90e77db150fbc57a559eaa01d85ce03f6
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 21:55:51 2018 +0900
installer: keymap: Fix keymap selection of layouts with not variant.
* gnu/installer/newt/keymap.scm (run-keymap-page): Test if the layout has no
variant at 'variant step, instead of raising a condition at 'layout step.
---
gnu/installer/newt/keymap.scm | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 9178a43..55a0aa6 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -66,28 +66,24 @@ names of the selected keyboard layout and variant."
(id 'layout)
(compute
(lambda _
- (let* ((layout (run-layout-page
- layouts
- (lambda (layout)
- (x11-keymap-layout-description layout)))))
- (if (null? (x11-keymap-layout-variants layout))
- ;; Break if this layout does not have any variant.
- (raise
- (condition
- (&installer-step-break)))
- layout)))))
+ (run-layout-page
+ layouts
+ (lambda (layout)
+ (x11-keymap-layout-description layout))))))
;; Propose the user to select a variant among those supported by the
;; previously selected layout.
(installer-step
(id 'variant)
(compute
(lambda (result _)
- (let ((variants (x11-keymap-layout-variants
- (result-step result 'layout))))
- (run-variant-page variants
- (lambda (variant)
- (x11-keymap-variant-description
- variant)))))))))
+ (let* ((layout (result-step result 'layout))
+ (variants (x11-keymap-layout-variants layout)))
+ ;; Return #f if the layout does not have any variant.
+ (and (not (null? variants))
+ (run-variant-page variants
+ (lambda (variant)
+ (x11-keymap-variant-description
+ variant))))))))))
(define (format-result result)
(let ((layout (x11-keymap-layout-name
- 24/68: installer: Do not ask for keyboard model., (continued)
- 24/68: installer: Do not ask for keyboard model., guix-commits, 2019/01/17
- 38/68: installer: locale: Make clear that the point is to select a glibc locale., guix-commits, 2019/01/17
- 37/68: installer: Reorder partitionment step., guix-commits, 2019/01/17
- 39/68: installer: locale: Set English as the default language., guix-commits, 2019/01/17
- 36/68: installer: Fix compute calls., guix-commits, 2019/01/17
- 40/68: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/17
- 41/68: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/17
- 54/68: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/17
- 60/68: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/17
- 45/68: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/17
- 42/68: installer: keymap: Fix keymap selection of layouts with not variant.,
guix-commits <=
- 46/68: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/17
- 48/68: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/17
- 61/68: installer: Remove debug popup., guix-commits, 2019/01/17
- 56/68: installer: Various renamings., guix-commits, 2019/01/17
- 52/68: installer: partionment: Add encryption support., guix-commits, 2019/01/17
- 27/68: installer: Add new pages., guix-commits, 2019/01/17
- 57/68: installer: Various renamins follow-up., guix-commits, 2019/01/17
- 44/68: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/17
- 28/68: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/17
- 58/68: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/17