[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Clarify which storage exceptions are bugs (#557928).



In turnOnFilesystems, some exceptions are bugs in anaconda and some are just
fatal errors reported by the underlying tools.  An example of the latter is
not being able to resize a filesystem due to space issues.  These should not
get the exception dialog since that looks like anaconda is at fault.  For all
other cases, it's likely an anaconda bug and should get the exception
dialog.
---
 packages.py |   52 ++++++++++------------------------------------------
 1 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/packages.py b/packages.py
index 6a5a05c..4ae9f4d 100644
--- a/packages.py
+++ b/packages.py
@@ -107,28 +107,6 @@ def turnOnFilesystems(anaconda):
 
     try:
         anaconda.storage.doIt()
-    except DeviceResizeError as (msg, device):
-        # XXX does this make any sense? do we support resize of
-        #     devices other than partitions?
-        title = _("Device Resize Failed")
-        message = _("An error was encountered while "
-                    "resizing device %s.") % (device,)
-        details = msg
-    except DeviceCreateError as (msg, device):
-        title = _("Device Creation Failed")
-        message = _("An error was encountered while "
-                    "creating device %s.") % (device,)
-        details = msg
-    except DeviceDestroyError as (msg, device):
-        title = _("Device Removal Failed")
-        message = _("An error was encountered while "
-                    "removing device %s.") % (device,)
-        details = msg
-    except DeviceError as (msg, device):
-        title = _("Device Setup Failed")
-        message = _("An error was encountered while "
-                    "setting up device %s.") % (device,)
-        details = msg
     except FSResizeError as (msg, device):
         title = _("Resizing Failed")
         message = _("There was an error encountered while "
@@ -143,27 +121,17 @@ def turnOnFilesystems(anaconda):
         message = _("An error was encountered while "
                     "migrating filesystem on device %s.") % (device,)
         details = msg
-    except FormatCreateError as (msg, device):
-        title = _("Formatting Failed")
-        message = _("An error was encountered while "
-                    "formatting device %s.") % (device,)
-        details = msg
     except Exception as e:
-        # catch-all
-        title = _("Storage Activation Failed")
-        message = _("An error was encountered while "
-                    "activating your storage configuration.")
-        details = str(e)
-
-    if title:
-        rc = anaconda.intf.detailedMessageWindow(title, message, details,
-                            type = "custom",
-                            custom_buttons = [_("_File Bug"), _("_Exit installer")])
-
-        if rc == 0:
-            raise
-        elif rc == 1:
-            sys.exit(1)
+        raise
+
+    rc = anaconda.intf.detailedMessageWindow(title, message, details,
+                        type = "custom",
+                        custom_buttons = [_("_File Bug"), _("_Exit installer")])
+
+    if rc == 0:
+        raise
+    elif rc == 1:
+        sys.exit(1)
 
     if not anaconda.upgrade:
         anaconda.storage.turnOnSwap()
-- 
1.6.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]