From 7fe83be76c6aac0778225a0106b46293d34543bf Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 10 Sep 2009 19:13:59 +0200 Subject: apt/progress/__init__.py: Correctly ignore ECHILD by checking before EINTR (Closes: #546007) As the check for != EINTR will re-raise the error, we have to check ECHILD before it. --- apt/progress/__init__.py | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py index 337bd161..9f348ffd 100644 --- a/apt/progress/__init__.py +++ b/apt/progress/__init__.py @@ -297,10 +297,10 @@ class InstallProgress(DumbInstallProgress): if pid == self.child_pid: break except OSError, (errno_, errstr): - if errno_ != errno.EINTR: - raise if errno_ == errno.ECHILD: break + if errno_ != errno.EINTR: + raise return res def run(self, pm): diff --git a/debian/changelog b/debian/changelog index 6babe14c..6b0c2297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ python-apt (0.7.13.3) UNRELEASED; urgency=low the same behavior as in 0.7.92 * apt/package.py: - Use the source version instead of the binary version in fetch_source(). + * apt/progress/__init__.py: + - Correctly ignore ECHILD by checking before EINTR (Closes: #546007) -- Julian Andres Klode Fri, 28 Aug 2009 14:38:06 +0200 -- cgit v1.2.3