if our only option is to cancel, don't bother showing the dialog, we'll need to catch the exception in our code anyway and we can just display the error there. (#51048)

2 files changed, 8 insertions, 0 deletions

diff --git a/gui.py b/gui.py
index 66f782e37..cfd387159 100755
--- a/gui.py
+++ b/gui.py
@@ -90,6 +90,10 @@ def processEvents():
         mainiteration (FALSE)
 
 def partedExceptionWindow(exc):
+    # if our only option is to cancel, let us handle the exception
+    # in our code and avoid popping up the exception window here.
+    if exc.options == parted.EXCEPTION_CANCEL:
+        return parted.EXCEPTION_UNHANDLED
     print exc.type_string
     print exc.message
     print exc.options
diff --git a/text.py b/text.py
index 2da2d2016..350aac492 100644
--- a/text.py
+++ b/text.py
@@ -270,6 +270,10 @@ class InstallInterface:
         return None
 
     def partedExceptionWindow(self, exc):
+        # if our only option is to cancel, let us handle the exception
+        # in our code and avoid popping up the exception window here.
+        if exc.options == parted.EXCEPTION_CANCEL:
+            return parted.EXCEPTION_UNHANDLED
         buttons = []
         buttonToAction = {}
         flags = ((parted.EXCEPTION_FIX, N_("Fix")),