summaryrefslogtreecommitdiff
path: root/apt
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-09-10 19:13:59 +0200
committerJulian Andres Klode <jak@debian.org>2009-09-10 19:13:59 +0200
commit7fe83be76c6aac0778225a0106b46293d34543bf (patch)
tree109ac8d0965ea4dac09eb7dd4ca6547fc1df63a6 /apt
parent4be008cb4dcaa8d6a97b1e3393bc68f9cc48655e (diff)
downloadpython-apt-7fe83be76c6aac0778225a0106b46293d34543bf.tar.gz
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.
Diffstat (limited to 'apt')
-rw-r--r--apt/progress/__init__.py4
1 files changed, 2 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):