Related: rhbz#1060255
blivet.sanityCheck() returns a list of SanityExceptions with string messages, not lists of strings. Change StorageSpoke.execute() appropriately.
Note that self.errors and self.warnings are used as lists of strings throughout the StorageSpoke class, so the return value of sanityCheck() must be converted befored self.errors and self.warnings are set.
Also change log.warn to log.warning.
Signed-off-by: mulhern amulhern@redhat.com --- pyanaconda/ui/tui/spokes/storage.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index 05cf122..b4d40f1 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -29,6 +29,8 @@ from pyanaconda.ui.tui.simpleline import TextWidget, CheckboxWidget from pykickstart.constants import AUTOPART_TYPE_LVM, AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_PLAIN from blivet.size import Size from blivet.errors import StorageError +from blivet.errors import SanityError +from blivet.errors import SanityWarning from blivet.devices import DASDDevice, FcoeDiskDevice, iScsiDiskDevice, MultipathDevice, ZFCPDiskDevice from pyanaconda.flags import flags from pyanaconda.kickstart import doKickstartStorage @@ -304,14 +306,17 @@ class StorageSpoke(NormalTUISpoke): self._ready = True else: print(_("Checking storage configuration...")) - (self.errors, self.warnings) = self.storage.sanityCheck() + exns = self.storage.sanityCheck() + errors = [exn.message for exn in exns if isinstance(exn, SanityError)] + warnings = [exn.message for exn in exns if isinstance(exn, SanityWarning)] + (self.errors, self.warnings) = (errors, warnings) self._ready = True for e in self.errors: log.error(e) - print e + print(e) for w in self.warnings: - log.warn(w) - print w + log.warning(w) + print(w)
def initialize(self): NormalTUISpoke.initialize(self)