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

[PATCH 5/5] Offer to ignore unformatted DASDs rather than forcing exit (#580456)



Similar to the fix for finding unformatted DASDs in rescue mode, rename
the 'Exit Installer' button to 'Ignore'.  Installation continues fine
when you ignore unformatted DASDs.  A little backstory, at the point in
time when I was working on this patch, I chose to force exit because
continuing with some unformatted DASDs did not work well with the
storage code at the time.  Seems to work now, so the choices users get
are Format and Ignore.

Since this is similar to what the rescue mode change does, I removed the
special "rescue" return value and just have it return 1.

Related: rhbz#582638
---
 installinterfacebase.py |    2 +-
 rescue.py               |    2 +-
 storage/dasd.py         |    6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/installinterfacebase.py b/installinterfacebase.py
index 59099b6..024a28d 100644
--- a/installinterfacebase.py
+++ b/installinterfacebase.py
@@ -71,7 +71,7 @@ class InstallInterfaceBase(object):
                  "these devices." % c,
                  c)
         icon = "/usr/share/icons/gnome/32x32/status/dialog-error.png"
-        buttons = [_("_Format"), _("_Exit installer")]
+        buttons = [_("_Format"), _("_Ignore")]
         return self.detailedMessageWindow(title, msg, devs.strip(),
                                              type="custom",
                                              custom_icon=icon,
diff --git a/rescue.py b/rescue.py
index 2076951..b613bbd 100644
--- a/rescue.py
+++ b/rescue.py
@@ -120,7 +120,7 @@ class RescueInterface(InstallInterfaceBase):
 
     def questionInitializeDASD(self, c, devs):
         # Special return value to let dasd.py know we're rescue mode
-        return "rescue"
+        return 1
 
     def shutdown (self):
         pass
diff --git a/storage/dasd.py b/storage/dasd.py
index 83c3cde..2b95b19 100644
--- a/storage/dasd.py
+++ b/storage/dasd.py
@@ -115,11 +115,7 @@ class DASD:
 
             rc = intf.questionInitializeDASD(c, devs)
             if rc == 1:
-                log.info("    not running dasdfmt, exiting installer")
-                sys.exit(0)
-            # Check for special rescue mode return
-            elif rc == "rescue":
-                log.info("    rescue mode: not running dasdfmt")
+                log.info("    not running dasdfmt, continuing installation")
                 return
 
         # gather total cylinder count
-- 
1.6.6.1


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