* Merged changes frrom mvo

* Do not use pango markup in the plural gettext strings

3 files changed, 37 insertions, 4 deletions

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index efb93bcc..e67009cf 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -176,7 +176,7 @@ class DistUpgradeControler(object):
         iprogress = self._view.getInstallProgress()
         try:
             res = self.cache.commit(fprogress,iprogress)
-        except IOError, e:
+        except (SystemError, IOError), e:
             self._view.error(_("Error during commit"),
                              _("Some problem occured during the upgrade. "
                                "This is mostly a network problem, please "
@@ -211,6 +211,15 @@ class DistUpgradeControler(object):
                                          changes, 0):
             fprogress = self._view.getFetchProgress()
             iprogress = self._view.getInstallProgress()
+            try:
+                res = self.cache.commit(fprogress,iprogress)
+            except (SystemError, IOError), e:
+                self._view.error(_("Error during commit"),
+                                 _("Some problem occured during the clean-up. "
+                                   "Please see the below message for more "
+                                   "information. ",
+                                   "%s" % e)
+
             self.cache.commit(fprogress,iprogress)
             
     def askForReboot(self):
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 4fc813bc..b6ff38b2 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -106,6 +106,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.progress = parent.progressbar_cache
         self.expander = parent.expander_terminal
         self.term = parent._term
+        self.parent = parent
         # setup the child waiting
         reaper = vte.reaper_get()
         reaper.connect("child-exited", self.child_exited)
@@ -124,9 +125,32 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd,
                     "DEBIAN_FRONTEND=gnome",
                     "APT_LISTCHANGES_FRONTEND=gtk"]
-    def error(self, error):
-        pass
+    def error(self, pkg, errormsg):
+        dialog = gtk.MessageDialog(self.parent.window_main, 0,
+                                   gtk.MESSAGE_ERROR,
+                                   gtk.BUTTONS_OK,"")
+        summary = _("Error installing '%s'" % pkg)
+        msg = _("During the install a error occured. This is usually a bug "
+                "in the packages, please report it. See the message below "
+                "for more information. ")
+        msg="<big><b>%s</b></big>\n\n%s" % (summary,msg)
+        dialog.set_markup(msg)
+        dialog.vbox.set_spacing(6)
+        if errormsg != None:
+          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(errormsg)
+          textview.show()
+          scroll.add(textview)
+          scroll.show()
+          dialog.vbox.pack_end(scroll)
+        dialog.run()
+        dialog.destroy()
     def conffile(self, current, new):
+        self.expander.set_expanded=True
         pass
     def fork(self):
         pid = self.term.forkpty(envv=self.env)
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 17cdcbd1..d7ea050a 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -394,7 +394,7 @@ class UpdateManager(SimpleGladeApp):
           self.label_downsize.hide()
           self.button_cancel.grab_default()
       else:
-          text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.packages), len(self.packages))+"</b></big>"
+          text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"</b></big>"
           
           text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size))
           self.expander_details.set_sensitive(True)