Merge nitotv apt fixes into 1.4.81.4.8+nitotv

1 files changed, 18 insertions, 0 deletions

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index b62c50c00..3f7f2bbf0 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -435,6 +435,24 @@ string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config)
    } else
    {
       FullQueueName = AccessSchema + U.Host;
+
+      int parallel(_config->FindI("Acquire::"+U.Access+"::MaxParallel",8));
+      if (parallel > 0) {
+	 typedef map<string, int> indexmap;
+	 static indexmap indices;
+
+	 pair<indexmap::iterator, bool> cache(indices.insert(indexmap::value_type(FullQueueName, -1)));
+	 if (cache.second || cache.first->second == -1) {
+	    int &index(indices[U.Access]);
+	    if (index >= parallel)
+	       index = 0;
+	    cache.first->second = index++;
+	 }
+
+	 ostringstream value;
+	 value << U.Access << "::" << cache.first->second;
+	 FullQueueName = value.str();
+      }
    }
    unsigned int Instances = 0, SchemaLength = AccessSchema.length();