[anaconda:rhel7/master 2/2] Additional message if kickstart was used but did not finish (#1117908)
Chris Lumens
clumens at redhat.com
Wed Aug 20 18:39:07 UTC 2014
> 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)
Remember that this string is going to get put on the hub as the text
underneath the spoke's title. I think what you've got here is too long
to fit - especially when translated into German.
If you've got a lot to say, typically we cram the details into
self.errors and then everything else should sort itself out.
- Chris
More information about the anaconda-patches
mailing list