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

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 91936f153a6d1026350a1f58bf93f54d2ee3e1dc
Author: Ludovic Courtès <address@hidden>
Date:   Tue May 7 11:48:51 2019 +0200

    installer: "Exit" button in user page actually exits.
    
    Fixes <https://bugs.gnu.org/35607>.
    Reported by Florian Pelz <address@hidden>.
    
    * gnu/installer/newt/user.scm (run-user-page): Add 'cond' clause for
    ARGUMENT = EXIT-BUTTON.
---
 gnu/installer/newt/user.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm
index f866de5..c797eb6 100644
--- a/gnu/installer/newt/user.scm
+++ b/gnu/installer/newt/user.scm
@@ -19,6 +19,7 @@
 
 (define-module (gnu installer newt 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 utils)
   #:use-module (guix i18n)
@@ -27,6 +28,8 @@
   #:use-module (ice-9 receive)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
   #:export (run-user-page))
 
 (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.")
                                   (G_ "No user"))
                   (run users))
-                (reverse users)))))
+                (reverse users))
+               ((components=? argument exit-button)
+                (raise
+                 (condition
+                  (&installer-step-abort)))))))
           (lambda ()
             (destroy-form-and-pop form))))))