[anaconda:rhel7/master 4/8] Adapt to new blivet.sanityCheck() return type (#1060255)
mulhern
amulhern at redhat.com
Fri Feb 7 15:00:33 UTC 2014
Related: rhbz#1060255
blivet.sanityCheck() returns lists of SanityErrors with string messages,
not lists of strings. Change StorageSpoke.execute() appropriately.
Also change log.warn to log.warning.
Signed-off-by: mulhern <amulhern at redhat.com>
---
pyanaconda/ui/tui/spokes/storage.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 05cf122..914ef01 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -307,11 +307,13 @@ class StorageSpoke(NormalTUISpoke):
(self.errors, self.warnings) = self.storage.sanityCheck()
self._ready = True
for e in self.errors:
- log.error(e)
- print e
+ msg = e.message
+ log.error(msg)
+ print(msg)
for w in self.warnings:
- log.warn(w)
- print w
+ msg = w.message
+ log.warning(msg)
+ print(msg)
def initialize(self):
NormalTUISpoke.initialize(self)
--
1.8.3.1
More information about the anaconda-patches
mailing list