From 1ef0b5e24d3b508b8b43f2643ff1c4932e091774 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 28 Oct 2006 12:31:29 +0200 Subject: * DistUpgrade/DistUpgradeViewGtk.py: - protect against errors when setting the icon (lp: #68697) --- DistUpgrade/DistUpgradeViewGtk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'DistUpgrade/DistUpgradeViewGtk.py') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 97a57772..a34e90f6 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -323,7 +323,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): logging.warning("Error setting locales (%s)" % e) icons = gtk.icon_theme_get_default() - gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) + try: + gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) + except gobject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass SimpleGladeApp.__init__(self, gladedir+"/DistUpgrade.glade", None, domain="update-manager") self.prev_step = 0 # keep a record of the latest step -- cgit v1.2.3 From 0b971142001adf68f9014ec2526ad2f4ac18e820 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Oct 2006 16:59:56 +0100 Subject: * DistUpgrade/DistUpgradeViewGtk.py: - reset self.read when unexpected data arrives --- DistUpgrade/Changelog | 3 +++ DistUpgrade/DistUpgradeViewGtk.py | 2 ++ 2 files changed, 5 insertions(+) (limited to 'DistUpgrade/DistUpgradeViewGtk.py') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index f890bf04..46e6fb89 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,5 +1,8 @@ 2006-10-28: - catch errors when load_icon() does not work +2006-10-27: + - reset self.read so that we do not loop endlessly when dpkg + sends unexpected data (lp: #68553) 2006-10-26: - make sure that xserver-xorg-video-all get installed if xserver-xorg-driver-all was installed before (lp: #58424) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index a34e90f6..07a94110 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -271,6 +271,8 @@ class GtkInstallProgressAdapter(InstallProgress): InstallProgress.updateInterface(self) except ValueError, e: logging.error("got ValueError from InstallPrgoress.updateInterface. Line was '%s' (%s)" % (self.read, e)) + # reset self.read so that it can continue reading and does not loop + self.read = "" # check if we haven't started yet with packages, pulse then if self.start_time == 0.0: self.progress.pulse() -- cgit v1.2.3