Skip to content

Commit

Permalink
Do not try to catch FSResizeError.
Browse files Browse the repository at this point in the history
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@redhat.com>
  • Loading branch information
mulkieran committed Jun 18, 2015
1 parent 0ba1aba commit aaaeede
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions blivet/osinstall.py
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit aaaeede

Please sign in to comment.