[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f14-branch master 1/3] Properly rescan disks when moving back (#635778)



NOTE: I've tested this against RC3. It now only scans disks after the 
NOTE: basic/expert screen and the autopart screen, and only when going 
NOTE: forward, not back. You can also now go all the way back to the 
NOTE: start w/o it crashing.

Only call storage.reset() once when moving forward from the autopart
screen.

Related: rhbz#635778
---
 pyanaconda/iw/autopart_type.py     |    7 +++++++
 pyanaconda/iw/partition_gui.py     |    6 ------
 pyanaconda/storage/partitioning.py |    1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index fee55ba..b1276b0 100644
--- a/pyanaconda/iw/autopart_type.py
+++ b/pyanaconda/iw/autopart_type.py
@@ -147,6 +147,13 @@ class PartitionTypeWindow(InstallWindow):
         if self.storage.checkNoDisks():
             raise gui.StayOnScreen
 
+        # temporarily unset storage.clearPartType so that all devices will be
+        # found during storage reset
+        clearPartType = self.anaconda.storage.clearPartType
+        self.anaconda.storage.clearPartType = None
+        self.anaconda.storage.reset()
+        self.anaconda.storage.clearPartType = clearPartType
+
         self.storage.clearPartChoice = self.buttonGroup.getCurrent()
 
         if self.buttonGroup.getCurrent() == "custom":
diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py
index 0885959..015aa76 100644
--- a/pyanaconda/iw/partition_gui.py
+++ b/pyanaconda/iw/partition_gui.py
@@ -906,12 +906,6 @@ class PartitionWindow(InstallWindow):
 
     def getPrev(self):
         self.stripeGraph.shutDown()
-        # temporarily unset storage.clearPartType so that all devices will be
-        # found during storage reset
-        clearPartType = self.storage.clearPartType
-        self.storage.clearPartType = None
-        self.storage.reset()
-        self.storage.clearPartType = clearPartType
         self.tree.clear()
         del self.parent
         return None
diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py
index a655d0d..cf6cce3 100644
--- a/pyanaconda/storage/partitioning.py
+++ b/pyanaconda/storage/partitioning.py
@@ -177,7 +177,6 @@ def doAutoPartition(anaconda):
     log.debug("storage.partitioned: %s" % [d.name for d in anaconda.storage.partitioned])
     log.debug("all names: %s" % [d.name for d in anaconda.storage.devices])
     if anaconda.dir == DISPATCH_BACK:
-        anaconda.storage.reset()
         return
 
     disks = []
-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]