Only call storage.reset() once when moving backwards from the
partitioning GUI.
Related: rhbz#595659
---
iw/partition_gui.py | 6 ------
storage/partitioning.py | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 4c13a65..4ede78d 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -903,12 +903,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/storage/partitioning.py b/storage/partitioning.py
index fa1a9d4..c4d1db1 100644
--- a/storage/partitioning.py
+++ b/storage/partitioning.py
@@ -174,7 +174,12 @@ def doAutoPartition(anaconda):
log.debug("storage.partitioned: %s" % [d.name for d in anaconda.id.storage.partitioned])
log.debug("all names: %s" % [d.name for d in anaconda.id.storage.devices])
if anaconda.dir == DISPATCH_BACK:
+ # temporarily unset storage.clearPartType so that all devices will be
+ # found during storage reset
+ clearPartType = anaconda.id.storage.clearPartType
+ anaconda.id.storage.clearPartType = None
anaconda.id.storage.reset()
+ anaconda.id.storage.clearPartType = clearPartType
return
disks = []
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
