[master/rhel7-branch][PATCH 1/2] Don't run storageInitialize after dasdfmt (#1074010)

Samantha N. Bueno sbueno+anaconda at redhat.com
Thu Sep 25 21:28:10 UTC 2014


This is overkill, unnecessary, and best of all, it prevents a traceback
from occurring.

Related: rhbz#1074010
---
 pyanaconda/ui/gui/spokes/lib/dasdfmt.py | 4 ----
 pyanaconda/ui/gui/spokes/storage.py     | 4 ----
 pyanaconda/ui/tui/spokes/storage.py     | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/lib/dasdfmt.py b/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
index c0018fe..64ead76 100644
--- a/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
+++ b/pyanaconda/ui/gui/spokes/lib/dasdfmt.py
@@ -97,10 +97,6 @@ class DasdFormatDialog(GUIObject):
                 log.error(str(err))
                 continue
 
-        # And now to fire up the storage reinitialization.
-        protectedNames = [d.name for d in self.storage.protectedDevices]
-        storageInitialize(self.storage, self.data, protectedNames)
-
         with self._epoch_lock:
             self.update_dialog(epoch_started)
 
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 4d0b9cb..2035d4b 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -710,10 +710,6 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                 log.error(str(err))
                 continue
 
-        # now re-initialize storage to pick up the newly formatted disks
-        protectedNames = [d.name for d in self.storage.protectedDevices]
-        storageInitialize(self.storage, self.data, protectedNames)
-
         # I really hate doing this, but the way is the way; probably the most
         # correct way to kajigger the storage spoke into becoming ready
         self.execute()
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 7d0f12c..d73b615 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -306,10 +306,6 @@ class StorageSpoke(NormalTUISpoke):
                 log.error(str(err))
                 continue
 
-        # when finished formatting we need to reinitialize storage
-        protectedNames = [d.name for d in self.storage.protectedDevices]
-        storageInitialize(self.storage, self.data, protectedNames)
-
     def apply(self):
         self.autopart = self.data.autopart.autopart
         self.data.ignoredisk.onlyuse = self.selected_disks[:]
-- 
1.9.3



More information about the anaconda-patches mailing list