* merged sebastians changes

* minor changes to them

1 files changed, 6 insertions, 12 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 6689b4d0..46ad948e 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -232,13 +232,6 @@ class DistUpgradeControler(object):
                                    "%s" % e)
             self.cache.commit(fprogress,iprogress)
             
-    def askForReboot(self):
-        return self._view.askYesNoQuestion(_("Reboot required"),
-                                           _("The upgrade is finished now. "
-                                             "A reboot is required to "
-                                             "now, do you want to do this "
-                                             "now?"))
-
     def abort(self):
         """ abort the upgrade, cleanup (as much as possible) """
         self.sources.restoreBackup(self.sources_backup_ext)
@@ -248,7 +241,7 @@ class DistUpgradeControler(object):
     # this is the core
     def dapperUpgrade(self):
         # sanity check (check for ubuntu-desktop, brokenCache etc)
-        self._view.updateStatus(_("Checking the system"))
+        self._view.updateStatus(_("Checking update system"))
         self._view.setStep(1)
         self.openCache()
         if not self.cache.sanityCheck(self._view):
@@ -267,16 +260,17 @@ class DistUpgradeControler(object):
             self.abort()
 
         # then open the cache (again)
-        self._view.updateStatus(_("Reading cache"))
+        self._view.updateStatus(_("Checking update system"))
         self.openCache()
 
         # calc the dist-upgrade and see if the removals are ok/expected
         # do the dist-upgrade
         self._view.setStep(3)
-        self._view.updateStatus(_("Performing the upgrade"))
+        self._view.updateStatus(_("Asking for confirmation"))
         if not self.askDistUpgrade():
             self.abort()
-            
+
+        self._view.updateStatus(_("Performing the upgrade"))            
         if not self.doDistUpgrade():
             self.abort()
             
@@ -285,7 +279,7 @@ class DistUpgradeControler(object):
         self.doPostUpgrade()
 
         # done, ask for reboot
-        if self.askForReboot():
+        if self._view.confirmRestart():
             subprocess.call(["reboot"])
         
     def run(self):