disks: Moving scan into an extra step

This avoids slight code duplication

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/python/__init__.py b/src/python/__init__.py
index 8966df186efc64b66ebc4825b5d41b13a5961930..ac6cf9deffce42b55b48aa846d2418b440edc1eb 100644 (file)
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -98,6 +98,7 @@ class Bricklayer(object):
                step.UnattendedWarning,
                step.Welcome,
                timezones.SelectTimezone,
+               disk.Scan,
                disk.UnattendedSelectDisk,
                disk.SelectDisk,
                disk.CalculatePartitionLayout,

diff --git a/src/python/disk.py b/src/python/disk.py
index 935a85660953c348d508150fa709cad4167b8a6c..0450b4ffccbcdd712ff1a5bf3c77f3f04e9046b5 100644 (file)
--- a/src/python/disk.py
+++ b/src/python/disk.py
@@ -416,6 +416,15 @@ class Partition(object):
                self.bricklayer.command(command)
 
 
+class Scan(step.Step):
+       def run(self):
+               with self.tui.progress(
+                       _("Scanning for Disks"),
+                       _("Scanning for disks..."),
+               ):
+                       self.bricklayer.disks.scan()
+
+
 class UnattendedSelectDisk(step.UnattendedStep):
        """
                Scans for any disks
@@ -425,9 +434,6 @@ class UnattendedSelectDisk(step.UnattendedStep):
                if self.bricklayer.disks.selected:
                        return
 
-               # Scan for disks
-               self.bricklayer.disks.scan()
-
                # End here if we could not find any disks
                if not self.bricklayer.disks.supported:
                        self.tui.error(
@@ -448,9 +454,6 @@ class SelectDisk(step.InteractiveStep):
                Ask the user which disk(s) to use for the installation process
        """
        def run(self):
-               # Scan for disks
-               self.bricklayer.disks.scan()
-
                # Create a dictionary with all disks
                disks = { disk : "%s" % disk for disk in self.bricklayer.disks.supported }