* various cosmetic fixes

* set debconf/apt-listchanges frontends to gtk
* updated readme

4 files changed, 16 insertions, 6 deletions

diff --git a/DistUpgrade/DistUpgrade.py b/DistUpgrade/DistUpgrade.py
index afaccf4d..22bf916c 100644
--- a/DistUpgrade/DistUpgrade.py
+++ b/DistUpgrade/DistUpgrade.py
@@ -89,9 +89,11 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
         def start(self):
             self.progress.show()
             self.progress.set_fraction(0)
+            self.status.show()
         def stop(self):
             self.progress.hide()
             self.status.hide()
+            self.status.hide()
         def pulse(self):
             # FIXME: move the status_str and progress_str into python-apt
             # (python-apt need i18n first for this)
@@ -132,7 +134,9 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
             # to default to gtk frontends, also add support for the timeout
             # of the terminal (to display something useful then)
             # -> longer term, move this code into python-apt 
-            self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd]
+            self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd,
+                        "DEBIAN_FRONTEND=gnome",
+                        "APT_LISTCHANGES_FRONTEND=gtk"]
         def fork(self):
             return self.term.forkpty(envv=self.env)
         def child_exited(self, term, pid, status):
@@ -143,7 +147,8 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
                 self.updateInterface()
             return self.apt_status
         def finishUpdate(self):
-            pass
+            self.progress.hide()
+            self.label_status.hide()
         def updateInterface(self):
             InstallProgress.updateInterface(self)
             self.progress.set_fraction(self.percent/100.0)
diff --git a/README.dist-upgrade b/README.dist-upgrade
index 9f85b3c0..63905e29 100644
--- a/README.dist-upgrade
+++ b/README.dist-upgrade
@@ -16,7 +16,6 @@ of three things:
    some additional steps like post-release cleanup
 
 
-
 The steps in additon to upgrading the installed packages fall into this 
 categories:
 * switch to new sources.list entries
@@ -24,7 +23,12 @@ categories:
 * remove packages/install others (breezy, R:mozilla-firefox, RI:firefox, 
   install ubuntu-desktop package again, R:portmap, I:language-package*)
 * check conffile settings (breezy: /etc/X11/xorg.conf; warty: /etc/modules)
+* check if {ubuntu,kubuntu,edubuntu}-desktop is installed
 * ask/change mirrors (breezy)
 * breezy: install new version of libgtk2.0-0 from hoary-updates, then 
   restart synaptic
-* reboot
\ No newline at end of file
+* reboot
+
+
+The tool need a backported "python-vte" and "python-apt" to work on
+breezy.
\ No newline at end of file
diff --git a/UpdateManager/Common/utils.py b/UpdateManager/Common/utils.py
index 92fe16b0..ffafadfb 100644
--- a/UpdateManager/Common/utils.py
+++ b/UpdateManager/Common/utils.py
@@ -6,3 +6,4 @@ def str_to_bool(str):
 
 def utf8(str):
   return unicode(str, 'latin1').encode('utf-8')
+
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index d1fd0086..1a62b255 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -668,8 +668,7 @@ class UpdateManager(SimpleGladeApp):
           uri = self.new_dist.upgradeTool
           print "Downloading %s to %s" % (uri, tmpdir)
           af = apt_pkg.GetPkgAcqFile(fetcher,uri,
-                                     descr=_("Upgrade tool"),
-                                     destDir=tmpdir)
+                                     descr=_("Upgrade tool"))
           fetcher.Run()
           print "Done downloading"
 
@@ -689,6 +688,7 @@ class UpdateManager(SimpleGladeApp):
               print "no script file found in extracted tarbal"
           else:
               print "runing: %s" % script
+              os.execv(script,"")
           
       # cleanup
       os.chdir("..")