From 0b971142001adf68f9014ec2526ad2f4ac18e820 Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@tas>
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')

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