summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2010-02-02 08:39:06 +0100
committerJulian Andres Klode <jak@debian.org>2010-02-02 08:39:06 +0100
commita3d3b31c936d7c244e7a3874ae6f453f75d5cf58 (patch)
treee5d52868a065179a389021cc3163fcda1aed73a6
parentb192548a21bae54b96c019f3330f6dac4817724b (diff)
downloadpython-apt-a3d3b31c936d7c244e7a3874ae6f453f75d5cf58.tar.gz
apt/progress/base.py: select.error objects do not have an errno attribute (Closes: #568005)
-rw-r--r--apt/progress/base.py4
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 2 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py
index 0c0796d6..6636cccc 100644
--- a/apt/progress/base.py
+++ b/apt/progress/base.py
@@ -264,8 +264,8 @@ class InstallProgress(object):
while True:
try:
select.select([self.statusfd], [], [], self.select_timeout)
- except select.error, err:
- if err.errno != errno.EINTR:
+ except select.error, (errno_, errstr):
+ if errno_ != errno.EINTR:
raise
self.update_interface()
diff --git a/debian/changelog b/debian/changelog
index 07263fe8..2a10635d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ python-apt (0.7.93.1) UNRELEASED; urgency=low
- de.po: Update against new template
* python/arfile.cc:
- Handle the case where ararchive_new returns NULL in debfile_new.
+ * apt/progress/base.py:
+ - select.error objects do not have an errno attribute (Closes: #568005)
-- Julian Andres Klode <jak@debian.org> Sat, 23 Jan 2010 15:35:55 +0100