summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DistUpgrade/Changelog3
-rw-r--r--DistUpgrade/DistUpgradeViewGtk.py2
2 files changed, 5 insertions, 0 deletions
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()