From c197bef880cf57d4c4257c5053d993f896f697f8 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 2 Dec 2009 16:48:32 +0100
Subject: * apt/progress/__init__.py:   - Fix InstallProgress.updateInterface()
 to cope with read() returning 0     on non-blocking file descriptors (LP:
 #491027).

---
 apt/progress/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'apt/progress')

diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py
index 8a9eb86f..8694de77 100644
--- a/apt/progress/__init__.py
+++ b/apt/progress/__init__.py
@@ -246,7 +246,10 @@ class InstallProgress(DumbInstallProgress):
             return
         try:
             while not self.read.endswith("\n"):
-                self.read += os.read(self.statusfd.fileno(), 1)
+                r = os.read(self.statusfd.fileno(), 1)
+                if not r:
+                    return
+                self.read += r
         except OSError, (errno_, errstr):
             # resource temporarly unavailable is ignored
             if errno_ != errno.EAGAIN and errno_ != errno.EWOULDBLOCK:
-- 
cgit v1.2.3