nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: "Exit" button in user page actually exits. 

Fixes <https://bugs.gnu.org/35607>.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.

* gnu/installer/newt/user.scm (run-user-page): Add 'cond' clause for
ARGUMENT = EXIT-BUTTON.
This commit is contained in:
Ludovic Courtès 2019-05-07 11:48:51 +02:00
parent 6c5790a2fa
commit 91936f153a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/installer/newt/user.scm
View File

@ -19,6 +19,7 @@
(define-module (gnu installer newt user) (define-module (gnu installer newt user)
#:use-module (gnu installer user) #:use-module (gnu installer user)
#:use-module ((gnu installer steps) #:select (&installer-step-abort))
#:use-module (gnu installer newt page) #:use-module (gnu installer newt page)
#:use-module (gnu installer newt utils) #:use-module (gnu installer newt utils)
#:use-module (guix i18n) #:use-module (guix i18n)
@ -27,6 +28,8 @@
#:use-module (ice-9 receive) #:use-module (ice-9 receive)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:export (run-user-page)) #:export (run-user-page))
(define* (run-user-add-page #:key (name "") (real-name "") (define* (run-user-add-page #:key (name "") (real-name "")
@ -247,7 +250,11 @@ administrator (\"root\").")
(run-error-page (G_ "Please create at least one user.") (run-error-page (G_ "Please create at least one user.")
(G_ "No user")) (G_ "No user"))
(run users)) (run users))
(reverse users))))) (reverse users))
((components=? argument exit-button)
(raise
(condition
(&installer-step-abort)))))))
(lambda () (lambda ()
(destroy-form-and-pop form)))))) (destroy-form-and-pop form))))))