diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-11-09 16:14:56 -0500 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2012-11-09 16:05:15 -0800 |
| commit | 0b26c191ae4dc07bad6eaa7f4aed1085ec726c51 (patch) | |
| tree | 825153b6ff0031b9544dfb1766a303631dc6b6b4 /pyanaconda/packaging | |
| parent | dc24fba7a1e14d0f0a2c7352f50e201fcf9399cc (diff) | |
| download | anaconda-0b26c191ae4dc07bad6eaa7f4aed1085ec726c51.tar.gz anaconda-0b26c191ae4dc07bad6eaa7f4aed1085ec726c51.tar.xz anaconda-0b26c191ae4dc07bad6eaa7f4aed1085ec726c51.zip | |
Don't attempt to handle exceptions when NFS mounts fail.
We don't want to display an error dialog (and we don't even support displaying
a dialog for this exception). We should instead raise an exception we know
how to handle, and then the status line for the source spoke will be set
correctly.
Diffstat (limited to 'pyanaconda/packaging')
| -rw-r--r-- | pyanaconda/packaging/__init__.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 25d4aa2b8..0108f683c 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -482,10 +482,8 @@ class Payload(object): device.format.setup(mountpoint=mountpoint) except StorageError as e: log.error("mount failed: %s" % e) - exn = PayloadSetupError(str(e)) - if errorHandler.cb(exn) == ERROR_RAISE: - device.teardown(recursive=True) - raise exn + device.teardown(recursive=True) + raise PayloadSetupError(str(e)) def _setupNFS(self, mountpoint, server, path, options): """ Prepare an NFS directory for use as a package source. """ @@ -511,10 +509,7 @@ class Payload(object): try: isys.mount(url, mountpoint, fstype="nfs", options=options) except SystemError as e: - log.error("mount failed: %s" % e) - exn = PayloadSetupError(str(e)) - if errorHandler.cb(exn) == ERROR_RAISE: - raise exn + raise PayloadSetupError(str(e)) ### ### METHODS FOR INSTALLING THE PAYLOAD |