From ee7af1bd58a717601fc30b5e7702d688749d2419 Mon Sep 17 00:00:00 2001
From: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>
Date: Mon, 7 May 2012 21:16:25 +0200
Subject: * apt-pkg/acquire-worker.cc:   - revert the use of FileFd::Write in
 OutFdReady as we don't want error     reports about EAGAIN here as we retry
 later. Thanks to YOSHINO Yoshihito     for the report. (Closes: #671721)

---
 apt-pkg/acquire-worker.cc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 8bc043c58..d6db8bc02 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -511,10 +511,17 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
 /* */
 bool pkgAcquire::Worker::OutFdReady()
 {
-   if (FileFd::Write(OutFd,OutQueue.c_str(),OutQueue.length()) == false)
+   int Res;
+   do
+   {
+      Res = write(OutFd,OutQueue.c_str(),OutQueue.length());
+   }
+   while (Res < 0 && errno == EINTR);
+
+   if (Res <= 0)
       return MethodFailure();
-   
-   OutQueue.clear();
+
+   OutQueue.erase(0,Res);
    if (OutQueue.empty() == true)
       OutReady = false;
    
-- 
cgit v1.2.3