branch master updated: installer: Report to the user the formatted partitions.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

m1gu3l pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new bc9e66f  installer: Report to the user the formatted partitions.
bc9e66f is described below

commit bc9e66f0feb25c77898222cfe5f3ef484dcee95e
Author: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
AuthorDate: Sat Oct 31 12:15:35 2020 +0100

    installer: Report to the user the formatted partitions.
    
    * gnu/installer/newt/partitions.scm (define-module): Use (ice-9 format).
    (draw-formatting-page): Add parameter partitions and provide the list of
    formatted partitions to the user.
    (run-partitioning-page): Provide user-partitions to draw-formatting-page.
---
 gnu/installer/newt/partition.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 3b891d6..35f76db 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -25,6 +25,7 @@
   #:use-module (gnu installer newt page)
   #:use-module (gnu installer newt utils)
   #:use-module (guix i18n)
+  #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -56,11 +57,17 @@
                   #:button-callback-procedure button-exit-action)))
     (car result)))
 
-(define (draw-formatting-page)
+(define (draw-formatting-page partitions)
   "Draw a page asking for confirmation, and then indicating that partitions
 are being formatted."
-  (run-confirmation-page (G_ "We are about to format your hard disk.  All \
-its data will be lost.  Do you wish to continue?")
+  ;; TRANSLATORS: The ~{ and ~} format specifiers are used to iterate the list
+  ;; of device names of the user partitions that will be formatted.
+  (run-confirmation-page (format #f (G_ "We are about to write the configured \
+partition table to the disk and format the partitions listed below.  Their \
+data will be lost.  Do you wish to continue?~%~{ - ~a~%~}")
+                                 (map user-partition-file-name
+                                      (filter user-partition-need-formatting?
+                                              partitions)))
                          (G_ "Format disk?")
                          #:exit-button-procedure button-exit-action)
   (draw-info-page
@@ -773,7 +780,7 @@ by pressing the Exit button.~%~%")))
          (user-partitions (run-page non-install-devices))
          (user-partitions-with-pass (prompt-luks-passwords
                                      user-partitions))
-         (form (draw-formatting-page)))
+         (form (draw-formatting-page user-partitions)))
     ;; Make sure the disks are not in use before proceeding to formatting.
     (free-parted non-install-devices)
     (format-user-partitions user-partitions-with-pass)