Looks good,
Regards,
Hans
On 04/07/2009 01:42 AM, David Lehman wrote:
We shouldn't be mounting any filesystems in DeviceTree.populate. The
only way we should be able to get an FSError is doing the minSize
calculation, which should not raise exceptions in the first place. If
we do have a way to get filesystem errors, let's find out what they are
and fix them instead of masking them.
---
storage/__init__.py | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/storage/__init__.py b/storage/__init__.py
index 12151bd..5e5d0dc 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -274,30 +274,22 @@ class Storage(object):
if device.format.type == "luks" and device.format.exists:
self.__luksDevs[device.format.uuid] = device.format._LUKS__passphrase
- try:
- w = self.anaconda.intf.waitWindow(_("Finding Devices"),
- _("Finding storage devices..."))
- self.iscsi.startup(self.anaconda.intf)
- self.zfcp.startup()
- self.devicetree = DeviceTree(intf=self.anaconda.intf,
- ignored=self.ignoredDisks,
- exclusive=self.exclusiveDisks,
- clear=self.clearPartDisks,
- reinitializeDisks=self.reinitializeDisks,
- protected=self.protectedPartitions,
- zeroMbr=self.zeroMbr,
- passphrase=self.encryptionPassphrase,
- luksDict=self.__luksDevs)
- self.devicetree.populate()
- self.fsset = FSSet(self.devicetree)
- except FSError as e:
- self.anaconda.intf.messageWindow(_("Error"),
- _("Filesystem error detected, cannot continue."),
- custom_icon="error")
- sys.exit(0)
- finally:
- if w:
- w.pop()
+ w = self.anaconda.intf.waitWindow(_("Finding Devices"),
+ _("Finding storage devices..."))
+ self.iscsi.startup(self.anaconda.intf)
+ self.zfcp.startup()
+ self.devicetree = DeviceTree(intf=self.anaconda.intf,
+ ignored=self.ignoredDisks,
+ exclusive=self.exclusiveDisks,
+ clear=self.clearPartDisks,
+ reinitializeDisks=self.reinitializeDisks,
+ protected=self.protectedPartitions,
+ zeroMbr=self.zeroMbr,
+ passphrase=self.encryptionPassphrase,
+ luksDict=self.__luksDevs)
+ self.devicetree.populate()
+ self.fsset = FSSet(self.devicetree)
+ w.pop()
@property
def devices(self):
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
