[master 6/19] Change FSError to DeviceFormatError in handleUdevDeviceFormat.

mulkieran installerbot-noreply at redhat.com
Thu Jun 18 21:04:07 UTC 2015


From: mulhern <amulhern at redhat.com>

Related: #56

Could be creating any kind of format at this point, so use the corresponding
error.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/populator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blivet/populator.py b/blivet/populator.py
index d86fa39..7cb26ea 100644
--- a/blivet/populator.py
+++ b/blivet/populator.py
@@ -29,7 +29,7 @@
 
 from gi.repository import BlockDev as blockdev
 
-from .errors import CorruptGPTError, DeviceError, DeviceTreeError, DiskLabelScanError, DuplicateVGError, FSError, InvalidDiskLabelError, LUKSError
+from .errors import CorruptGPTError, DeviceError, DeviceFormatError, DeviceTreeError, DiskLabelScanError, DuplicateVGError, InvalidDiskLabelError, LUKSError
 from .devices import BTRFSSubVolumeDevice, BTRFSVolumeDevice, BTRFSSnapShotDevice
 from .devices import DASDDevice, DMDevice, DMLinearDevice, DMRaidArrayDevice, DiskDevice
 from .devices import FcoeDiskDevice, FileDevice, LoopDevice, LUKSDevice
@@ -1404,7 +1404,7 @@ def handleUdevDeviceFormat(self, info, device):
             device.format = formats.getFormat(format_designator, **kwargs)
             if device.format.type:
                 log.info("got format: %s", device.format)
-        except FSError:
+        except DeviceFormatError:
             log.warning("type '%s' on '%s' invalid, assuming no format",
                       format_designator, name)
             device.format = formats.DeviceFormat()


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/bce16f2cb76b5f3b6bc11daf6bcbd45b4d91b17a


More information about the anaconda-patches mailing list