me/guix
Archived
1
0
Fork 0
Code Activity

installer: network: Do not show an empty technology list.

Browse source 
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.
This commit is contained in:
Mathieu Othacehe 2018-12-05 21:58:26 +09:00 • committed by Ludovic Courtès
parent 9e58d4e90e
commit 77c00b1e57
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/installer/newt/network.scm
View file

@ -53,18 +53,32 @@ Internet and return the selected technology. For now, only technologies with
(string=? type "wifi")))) (string=? type "wifi"))))
(connman-technologies))) (connman-technologies)))
(run-listbox-selection-page (let ((items (technology-items)))
#:info-text (G_ "The install process requires an internet access.\ (if (null? items)
Please select a network technology.") (case (choice-window
#:title (G_ "Internet access") (G_ "Internet access")
#:listbox-items (technology-items) (G_ "Continue")
#:listbox-item->text technology->text (G_ "Exit")
#:button-text (G_ "Exit") (G_ "The install process requires an internet access, but no \
#:button-callback-procedure network device were found. Do you want to continue anyway?"))
(lambda _ ((1) (raise
(raise (condition
(condition (&installer-step-break))))
(&installer-step-abort)))))) ((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) (define (find-technology-by-type technologies type)
"Find and return a technology with the given TYPE in TECHNOLOGIES list." "Find and return a technology with the given TYPE in TECHNOLOGIES list."