[master 17/19] Do not try to catch FSResizeError.

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


From: mulhern <amulhern at redhat.com>

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 <amulhern at redhat.com>
---
 blivet/osinstall.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/blivet/osinstall.py b/blivet/osinstall.py
index 1c63302..05f249b 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()


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


More information about the anaconda-patches mailing list