04/26: installer: Do not add file systems which are invalid.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit d358ca40be0cd12a4abcc70d27738a092cc7f5e6
Author: John Darrington <address@hidden>
Date:   Mon Jan 16 21:51:37 2017 +0100

    installer: Do not add file systems which are invalid.
    
    * gnu/system/installer/mount-point.scm (mount-point-page-key-handler): Do
    not add invalid filesystems to the list of mount points.
---
 gnu/system/installer/mount-point.scm |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/system/installer/mount-point.scm 
b/gnu/system/installer/mount-point.scm
index 3abf675..daebc71 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -54,12 +54,14 @@
 
     (cond
      ((buttons-key-matches-symbol? nav ch 'continue)
-      (set! mount-points
-            (assoc-set! mount-points dev
-                        (make-file-system-spec
-                         (form-get-value form 'mount-point)
-                         (form-get-value form 'label)
-                         (form-get-value form 'fs-type))))
+      (let ((fss
+             (make-file-system-spec
+              (form-get-value form 'mount-point)
+              (form-get-value form 'label)
+              (form-get-value form 'fs-type))))
+        (when fss
+              (set! mount-points
+                    (assoc-set! mount-points dev fss))))
       (page-leave))
 
      ((buttons-key-matches-symbol? nav ch 'cancel)