* merged from michael

2 files changed, 18 insertions, 8 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 229b7107..ea2de522 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -158,6 +158,8 @@ class DistUpgradeControler(object):
     def doUpdate(self):
         self.cache._list.ReadMainList()
         progress = self._view.getFetchProgress()
+        # FIXME: retry here too? just like the DoDistUpgrade?
+        #        also remove all files from the lists partial dir!
         try:
             res = self.cache.update(progress)
         except IOError, e:
@@ -250,6 +252,7 @@ class DistUpgradeControler(object):
                     logging.debug("'%s' scheduled for remove but not in remove_candiates, skipping", pkgname)
         logging.debug("Finish checking for obsolete pkgs")
         changes = self.cache.getChanges()
+        logging.debug("The following packages are remove candidates: %s" % " ".join([pkg.name for pkg in changes]))
         if len(changes) > 0 and \
                self._view.confirmChanges(_("Remove obsolete Packages?"),
                                          changes, 0):
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 40597519..e1a7af96 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -40,6 +40,9 @@ from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain
 
 from gettext import gettext as _
 
+def utf8(str):
+  return unicode(str, 'latin1').encode('utf-8')
+
 class GtkOpProgress(apt.progress.OpProgress):
   def __init__(self, progressbar):
       self.progressbar = progressbar
@@ -144,14 +147,18 @@ class GtkInstallProgressAdapter(InstallProgress):
 
         logging.error("got a error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
         if errormsg != None:
-            buffer = self.textview_error.get_buffer()
-            buffer.set_text(errormsg)
-            self.scroll_error.show()
-
-        self.dialog_error.run()
-        self.dialog_error.destroy()
-        return False
-                      
+          scroll = gtk.ScrolledWindow()
+          scroll.set_size_request(400,200)
+          textview = gtk.TextView()
+          textview.set_cursor_visible(False)
+          textview.set_editable(False)
+          textview.get_buffer().set_text(utf8(errormsg))
+          textview.show()
+          scroll.add(textview)
+          scroll.show()
+          dialog.vbox.pack_end(scroll)
+        dialog.run()
+        dialog.destroy()
     def conffile(self, current, new):
         logging.debug("got a conffile-prompt from dpkg for pkg: '%s'" % current)
         self.expander.set_expanded(True)