summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/progress/__init__.py4
-rw-r--r--debian/changelog2
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 <jak@debian.org> Fri, 28 Aug 2009 14:38:06 +0200