From 7fe83be76c6aac0778225a0106b46293d34543bf Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apt/progress')

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):
-- 
cgit v1.2.3