fix build failure with the new apt-vendors stuff

[apt.git] / apt-pkg / acquire.cc

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 19bcca8a1face10e942b00f0d30c0076cc8180e1..a8a5abd344d3ab720ae0a590f2b6ad5bb5fdc1e2 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -244,11 +244,19 @@ void pkgAcquire::Dequeue(Item *Itm)
 {
    Queue *I = Queues;
    bool Res = false;
 {
    Queue *I = Queues;
    bool Res = false;

-   for (; I != 0; I = I->Next)
-      Res |= I->Dequeue(Itm);
-   

    if (Debug == true)
       clog << "Dequeuing " << Itm->DestFile << endl;
    if (Debug == true)
       clog << "Dequeuing " << Itm->DestFile << endl;

+
+   for (; I != 0; I = I->Next)
+   {
+      if (I->Dequeue(Itm))
+      {
+         Res = true;
+        if (Debug == true)
+           clog << "Dequeued from " << I->Name << endl;
+      }
+   }
+

    if (Res == true)
       ToFetch--;
 }
    if (Res == true)
       ToFetch--;
 }


@@ -269,9 +277,30 @@ string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config)
    /* Single-Instance methods get exactly one queue per URI. This is
       also used for the Access queue method  */
    if (Config->SingleInstance == true || QueueMode == QueueAccess)
    /* Single-Instance methods get exactly one queue per URI. This is
       also used for the Access queue method  */
    if (Config->SingleInstance == true || QueueMode == QueueAccess)

-       return U.Access;
+      return U.Access;

 
 

-   return U.Access + ':' + U.Host;
+   string AccessSchema = U.Access + ':',
+       FullQueueName = AccessSchema + U.Host;
+   unsigned int Instances = 0, SchemaLength = AccessSchema.length();
+
+   Queue *I = Queues;
+   for (; I != 0; I = I->Next) {
+      // if the queue already exists, re-use it
+      if (I->Name == FullQueueName)
+        return FullQueueName;
+
+      if (I->Name.compare(0, SchemaLength, AccessSchema) == 0)
+        Instances++;
+   }
+
+   if (Debug) {
+      clog << "Found " << Instances << " instances of " << U.Access << endl;
+   }
+
+   if (Instances >= (unsigned int)_config->FindI("Acquire::QueueHost::Limit",10))
+      return U.Access;
+
+   return FullQueueName;

 }
                                                                        /*}}}*/
 // Acquire::GetConfig - Fetch the configuration information            /*{{{*/
 }
                                                                        /*}}}*/
 // Acquire::GetConfig - Fetch the configuration information            /*{{{*/


@@ -874,21 +903,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
             << endl;
 
       std::string const dlstatus = status.str();
             << endl;
 
       std::string const dlstatus = status.str();

-      size_t done = 0;
-      size_t todo = dlstatus.size();
-      errno = 0;
-      int res = 0;
-      do
-      {
-        res = write(fd, dlstatus.c_str() + done, todo);
-        if (res < 0 && errno == EINTR)
-           continue;
-        if (res < 0)
-           break;
-        done += res;
-        todo -= res;
-      }
-      while (res > 0 && todo > 0);
+      FileFd::Write(fd, dlstatus.c_str(), dlstatus.size());

    }
 
    return true;
    }
 
    return true;