[anaconda:rhel7/master 2/2] Additional message if kickstart was used but did not finish (#1117908)

mulhern amulhern at redhat.com
Wed Aug 20 16:38:30 UTC 2014


Related: rhbz#1117908

The default message, "No disks selected", seems kind of misleading when
the actual problem is that the kickstart somehow failed to do its work.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 pyanaconda/ui/gui/spokes/storage.py | 9 +++++----
 pyanaconda/ui/tui/spokes/storage.py | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 0f0d2d2..ddb39c8 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -408,15 +408,16 @@ class StorageSpoke(NormalSpoke, StorageChecker):
     @property
     def status(self):
         """ A short string describing the current status of storage setup. """
-        msg = _("No disks selected")
+        msg = None
 
         if not self._confirmed:
             msg = _("Not configured")
         elif threadMgr.get(constants.THREAD_DASDFMT):
             msg = _("Formatting DASDs")
         elif flags.automatedInstall and not self.storage.rootDevice:
-            return msg
-        elif self.data.ignoredisk.onlyuse:
+            return msg if msg else _("Kickstart information insufficient to complete storage allocation")
+
+        if self.data.ignoredisk.onlyuse:
             msg = P_(("%d disk selected"),
                      ("%d disks selected"),
                      len(self.data.ignoredisk.onlyuse)) % len(self.data.ignoredisk.onlyuse)
@@ -430,7 +431,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             else:
                 msg = _("Custom partitioning selected")
 
-        return msg
+        return msg if msg else _("No disks selected")
 
     @property
     def localOverviews(self):
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 0e3b9fa..27c0f77 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -115,11 +115,12 @@ class StorageSpoke(NormalTUISpoke):
     @property
     def status(self):
         """ A short string describing the current status of storage setup. """
-        msg = _("No disks selected")
+        msg = None
 
         if flags.automatedInstall and not self.storage.rootDevice:
-            return msg
-        elif self.data.ignoredisk.onlyuse:
+            return _("Kickstart information insufficient to complete storage allocation")
+
+        if self.data.ignoredisk.onlyuse:
             msg = P_(("%d disk selected"),
                      ("%d disks selected"),
                      len(self.data.ignoredisk.onlyuse)) % len(self.data.ignoredisk.onlyuse)
@@ -134,7 +135,7 @@ class StorageSpoke(NormalTUISpoke):
             else:
                 msg = _("Custom partitioning selected")
 
-        return msg
+        return msg if msg else _("No disks selected")
 
     def _update_disk_list(self, disk):
         """ Update self.selected_disks based on the selection."""
-- 
1.9.3



More information about the anaconda-patches mailing list