[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: installer: network: Do not show an empty technology list.
From: |
guix-commits |
Subject: |
03/05: installer: network: Do not show an empty technology list. |
Date: |
Wed, 5 Dec 2018 08:12:04 -0500 (EST) |
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.
commit d8f044ea500399a24cf9207b2688af7ee86293cb
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 21:58:26 2018 +0900
installer: network: Do not show an empty technology list.
If no technology is detected, ask the user if he prefers to continue or to
exit the installer.
* gnu/installer/newt/network.scm (run-technology-page): Run a choice-window
if
technology-items procedure returns an empty list.
---
gnu/installer/newt/network.scm | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index ee6af06..64fab2a 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -53,18 +53,32 @@ Internet and return the selected technology. For now, only
technologies with
(string=? type "wifi"))))
(connman-technologies)))
- (run-listbox-selection-page
- #:info-text (G_ "The install process requires an internet access.\
- Please select a network technology.")
- #:title (G_ "Internet access")
- #:listbox-items (technology-items)
- #:listbox-item->text technology->text
- #:button-text (G_ "Exit")
- #:button-callback-procedure
- (lambda _
- (raise
- (condition
- (&installer-step-abort))))))
+ (let ((items (technology-items)))
+ (if (null? items)
+ (case (choice-window
+ (G_ "Internet access")
+ (G_ "Continue")
+ (G_ "Exit")
+ (G_ "The install process requires an internet access, but no \
+network device were found. Do you want to continue anyway?"))
+ ((1) (raise
+ (condition
+ (&installer-step-break))))
+ ((2) (raise
+ (condition
+ (&installer-step-abort)))))
+ (run-listbox-selection-page
+ #:info-text (G_ "The install process requires an internet access.\
+ Please select a network device.")
+ #:title (G_ "Internet access")
+ #:listbox-items items
+ #:listbox-item->text technology->text
+ #:button-text (G_ "Exit")
+ #:button-callback-procedure
+ (lambda _
+ (raise
+ (condition
+ (&installer-step-abort))))))))
(define (find-technology-by-type technologies type)
"Find and return a technology with the given TYPE in TECHNOLOGIES list."