From 595abe6aaad8c8a7992941e39c7e977c8fe33275 Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@top>
Date: Mon, 12 Dec 2005 13:25:16 +0100
Subject: * added errorhandling (need latest python-apt)

---
 UpdateManager/UpdateManager.py | 11 ++++++++++-
 debian/changelog               | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 99126e79..3795f398 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -465,7 +465,16 @@ class UpdateManager(SimpleGladeApp):
                                               "or upgraded software "
                                               "packages."))
     # FIXME: do a try/except here otherwise it may bomb
-    self.cache.update(progress)
+    try:
+        self.cache.update(progress)
+    except (IOError,SystemError), msg:
+        dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_ERROR,
+                                   gtk.BUTTONS_OK,"")
+        dialog.set_markup("<span weight=\"bold\" size=\"larger\">%s</span>"%\
+                          _("Error updating"))
+        dialog.format_secondary_text("%s" % msg)
+        dialog.run()
+        dialog.destroy()
     self.fillstore()
 
   def on_button_help_clicked(self, widget):
diff --git a/debian/changelog b/debian/changelog
index b481813f..ecc93a3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
 update-manager (0.40) dapper; urgency=low
 
-  * new upstream release
+  * new upstream release:
+    - switched from autotools to distutils
+    - massive code cleanups 
+    - use SimpleGladeApp now
+    - SoftwareProperties has a new GUI
+    - UpdateManager has support for upgrading from one dist to another
+      now (given that the required "recipe" for the upgrade is available)
+      See https://wiki.ubuntu.com/AutomaticUpgrade for details
+    - use python-apt for "reload" and "add cdrom" now
+    - improved the handling of sources.list a lot (including support for
+      /etc/apt/sources.list.d)
   * support for the AutomaticUpgrades spec added via the meta-release 
     information
   * data/update-manager.desktop.in: 
-- 
cgit v1.2.3