summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-10-17 19:00:39 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-10-17 19:00:39 +0200
commit24e4c5f2f2474b659dc9543c908f00cf8d4900ac (patch)
treebd5162ba535eb91ba4bbb5b86cf632506844e1f1
parent0bc703a0d36d8c99ac8ec9118111627623c006da (diff)
downloadpython-apt-24e4c5f2f2474b659dc9543c908f00cf8d4900ac.tar.gz
* DistUpgrade/DistUpgradeViewGtk.py:
- don't fail on unexpected input from dpkg
-rw-r--r--DistUpgrade/Changelog3
-rw-r--r--DistUpgrade/DistUpgradeViewGtk.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index a6faeb8a..050fc615 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,6 @@
+2006-10-17:
+ - ensure bzr and xserver-xorg-input-* is properly upgraded
+ - don't fail if dpkg sents unexpected status lines (lp: #66013)
2006-10-16:
- remove leftover references to ubuntu-base and
use ubuntu-minimal and ubuntu-standard instead
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index b176e8f0..13ede7ee 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -267,7 +267,10 @@ class GtkInstallProgressAdapter(InstallProgress):
self.label_status.set_text("")
def updateInterface(self):
- InstallProgress.updateInterface(self)
+ try:
+ InstallProgress.updateInterface(self)
+ except ValueError, e:
+ logging.error("got ValueError from InstallPrgoress.updateInterface. Line was '%s' (%s)" % (self.read, e)
# check if we haven't started yet with packages, pulse then
if self.start_time == 0.0:
self.progress.pulse()