fix for bug 26792

2 files changed, 30 insertions, 1 deletions

diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index b1ec022d3..62eabace0 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -18,7 +18,7 @@ class UpgradeExamineWindow (InstallWindow):
         threads_leave ()
         self.todo.upgradeFindPackages (self.root)
         threads_enter ()
-        
+
         if self.individualPackages.get_active ():
             # XXX fix me
             from package_gui import IndividualPackageSelectionWindow
diff --git a/iw/lilo_gui.py b/iw/lilo_gui.py
index 640af3ab7..9a705c516 100644
--- a/iw/lilo_gui.py
+++ b/iw/lilo_gui.py
@@ -7,6 +7,8 @@ from xpms_gui import CHECKBOX_ON_XPM
 from xpms_gui import CHECKBOX_OFF_XPM
 import GdkImlib
 import iutil
+import gui
+
 if iutil.getArch() == 'i386':
     import edd
 
@@ -39,6 +41,29 @@ class LiloWindow (InstallWindow):
         # to skip this screen
         self.bootdisk = None
 
+        # if doing an upgrade, offer choice of aborting upgrade.
+        # we can't allow them to go back in install, since we've
+        # started swap and mounted the systems filesystems
+        # if we've already started an upgrade, cannot back out
+        if self.todo.upgrade:
+            threads_leave()
+            rc = self.todo.intf.messageWindow(_("Proceed with upgrade?"),
+              _("The filesystems of the Linux installation "
+                "you have chosen to upgrade have already been "
+                "mounted. You cannot go back past this point. "
+                "\n\n") + 
+              _( "Would you like to continue with the upgrade?"),
+                type = "yesno").getrc()
+
+            threads_enter()
+
+            if not rc:
+                raise gui.StayOnScreen
+            else:
+                import sys
+                print _("Aborting upgrade")
+                sys.exit(0)
+
     def getNext (self):
         if not self.bootdisk: return None
 
@@ -228,6 +253,10 @@ class LiloWindow (InstallWindow):
             self.todo.bootdisk = 1
             return None
 
+#       cant go back past this screen in upgrades
+#        if self.todo.upgrade:
+#            self.ics.setPrevEnabled (0)
+
 # comment these two lines to get lilo screen in test mode
 #        if not self.todo.fstab.setupFilesystems:
 #            return None