[master][anaconda] Fix a couple pylint errors.

Samantha N. Bueno sbueno+anaconda at redhat.com
Mon Jun 1 15:28:29 UTC 2015


I always miss something when manually rebasing. And when I think
I'm ok, I don't run pylnt, so of course things like this happen.
---
 pyanaconda/ui/gui/spokes/lib/dasdfmt.py | 2 +-
 pyanaconda/ui/tui/spokes/storage.py     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/lib/dasdfmt.py b/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
index 4a5c789..27645ee 100644
--- a/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
+++ b/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
@@ -89,7 +89,7 @@ class DasdFormatDialog(GUIObject):
         for disk in self.to_format:
             try:
                 gtk_call_once(self._formatting_label.set_text, _("Formatting /dev/%s. This may take a moment.") % disk.name)
-                blockdev.s390.format_dasd(disk.name)
+                blockdev.s390.dasd_format(disk.name)
             except blockdev.S390Error as err:
                 # Log errors if formatting fails, but don't halt the installer
                 log.error(str(err))
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 39ee924..5aae6dd 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -333,9 +333,9 @@ class StorageSpoke(NormalTUISpoke):
 
         for disk in to_format:
             try:
-                print(_("Formatting /dev/%s. This may take a moment.") % disk)
-                format_dasd(disk)
-            except DasdFormatError as err:
+                print(_("Formatting /dev/%s. This may take a moment.") % disk.name)
+                blockdev.s390.dasd_format(disk.name)
+            except blockdev.S390Error as err:
                 # Log errors if formatting fails, but don't halt the installer
                 log.error(str(err))
                 continue
-- 
2.1.0



More information about the anaconda-patches mailing list