Minor fixes

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

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 385e773ffe76f9c4057900b60f5858b1e24ee2c5..6457fa6594642724d9c6a8e4f6a096e78392faa9 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire.cc,v 1.21 1998/12/11 06:01:26 jgg Exp $
+// $Id: acquire.cc,v 1.26 1999/01/30 08:08:54 jgg Exp $
 /* ######################################################################
 
    Acquire - File Acquiration
@@ -21,7 +21,7 @@
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <dirent.h>
 #include <sys/time.h>
@@ -413,6 +413,22 @@ unsigned long pkgAcquire::FetchNeeded()
    return Total;
 }
                                                                        /*}}}*/
+// pkgAcquire::UriBegin - Start iterator for the uri list              /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriBegin()
+{
+   return UriIterator(Queues);
+}
+                                                                       /*}}}*/
+// pkgAcquire::UriEnd - End iterator for the uri list                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgAcquire::UriIterator pkgAcquire::UriEnd()
+{
+   return UriIterator(0);
+}
+                                                                       /*}}}*/
 
 // Acquire::MethodConfig::MethodConfig - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
@@ -547,7 +563,7 @@ bool pkgAcquire::Queue::Shutdown()
    return true;
 }
                                                                        /*}}}*/
-// Queue::Finditem - Find a URI in the item list                       /*{{{*/
+// Queue::FindItem - Find a URI in the item list                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)
@@ -566,6 +582,9 @@ pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Wor
 bool pkgAcquire::Queue::ItemDone(QItem *Itm)
 {
    PipeDepth--;
+   if (Itm->Owner->Status == pkgAcquire::Item::StatFetching)
+      Itm->Owner->Status = pkgAcquire::Item::StatDone;
+   
    if (Itm->Owner->QueueCounter <= 1)
       Owner->Dequeue(Itm->Owner);
    else
@@ -586,9 +605,12 @@ bool pkgAcquire::Queue::Cycle()
    if (Items == 0 || Workers == 0)
       return true;
 
+   if (PipeDepth < 0)
+      return _error->Error("Pipedepth failure");
+                          
    // Look for a queable item
    QItem *I = Items;
-   while (PipeDepth < MaxPipeDepth)
+   while (PipeDepth < (signed)MaxPipeDepth)
    {
       for (; I != 0; I = I->Next)
         if (I->Owner->Status == pkgAcquire::Item::StatIdle)
@@ -600,6 +622,7 @@ bool pkgAcquire::Queue::Cycle()
       
       I->Worker = Workers;
       I->Owner->Status = pkgAcquire::Item::StatFetching;
+      PipeDepth++;
       if (Workers->QueueItem(I) == false)
         return false;
    }