* Merged with Michael

3 files changed, 12 insertions, 7 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index b90224a2..e229a849 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -232,9 +232,6 @@ class DistUpgradeControler(object):
                                    "%s" % e)
             self.cache.commit(fprogress,iprogress)
             
-    def askForReboot(self):
-        return self._view.confirm_restart()
-
     def abort(self):
         """ abort the upgrade, cleanup (as much as possible) """
         self.sources.restoreBackup(self.sources_backup_ext)
@@ -284,7 +281,7 @@ class DistUpgradeControler(object):
 
         # done, ask for reboot
         self._view.updateStatus(_("System upgrade is complete."))            
-        if self.askForReboot():
+        if self._view.confirmRestart():
             subprocess.call(["reboot"])
         
     def run(self):
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index ba223a1b..abc5b340 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -61,6 +61,14 @@ class DistUpgradeView(object):
     def askYesNoQuestion(self, summary, msg):
         " ask a Yes/No question and return True on 'Yes' "
         pass
+    def confirmRestart(self):
+        " generic ask about the restart, can be overriden "
+        summary = _("Reboot required")
+        msg =  _("The upgrade is finished now. "
+                 "A reboot is required to "
+                 "now, do you want to do this "
+                 "now?")
+        return self.askYesNoQuestion(summary, msg)
     def error(self, summary, msg, extended_msg=None):
         " display a error "
         pass
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index f5bceef0..f538c1a9 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -126,7 +126,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.term.show()
         self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd,
                     "DEBIAN_FRONTEND=gnome",
-                    "APT_LISTCHANGES_FRONTEND=gtk"]
+                    "APT_LISTCHANGES_FRONTEND=none"]
     def error(self, pkg, errormsg):
         dialog = gtk.MessageDialog(self.parent.window_main, 0,
                                    gtk.MESSAGE_ERROR,
@@ -297,11 +297,11 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
             return True
         return False
     
-    def confirm_restart(self):
+    def confirmRestart(self):
         self.dialog_restart.set_transient_for(self.window_main)
         res = self.dialog_restart.run()
         self.dialog_restart.hide()
-        if res == RESPONSE_YES:
+        if res == gtk.RESPONSE_YES:
             return True
         return False