From aaaeede52830c6ea5516b5ad433ea4b027440639 Mon Sep 17 00:00:00 2001 From: mulhern Date: Tue, 16 Jun 2015 14:11:57 -0400 Subject: [PATCH] Do not try to catch FSResizeError. Related: #56 It is no longer thrown anywhere. This means that a little bit of code in anaconda can be thrown out, but it does not cause a dependency. Signed-off-by: mulhern --- blivet/osinstall.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/blivet/osinstall.py b/blivet/osinstall.py index 1c6330201..05f249b81 100644 --- a/blivet/osinstall.py +++ b/blivet/osinstall.py @@ -31,7 +31,7 @@ from .storage_log import log_exception_info from .devices import FileDevice, NFSDevice, NoDevice, OpticalDevice, NetworkStorageDevice, DirectoryDevice -from .errors import FSTabTypeMismatchError, UnrecognizedFSTabEntryError, StorageError, FSResizeError, UnknownSourceDeviceError +from .errors import FSTabTypeMismatchError, UnrecognizedFSTabEntryError, StorageError, UnknownSourceDeviceError from .formats import get_device_format_class from .formats import getFormat from .flags import flags @@ -1055,10 +1055,7 @@ def turnOnFilesystems(storage, mountOnly=False, callbacks=None): try: storage.doIt(callbacks) - except FSResizeError as e: - if errorHandler.cb(e) == ERROR_RAISE: - raise - except Exception as e: + except Exception: raise storage.turnOnSwap()