X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b4fc9b6f648694ecb0d161cb14859da88b36881c..e75f306ea9596c82e3b0c188e9b5203fc9d619da:/apt-pkg/acquire.cc?ds=inline diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index ae3ba2e01..3c207fd27 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire.cc,v 1.48 2001/05/22 04:17:18 jgg Exp $ +// $Id: acquire.cc,v 1.50 2004/03/17 05:17:11 mdz Exp $ /* ###################################################################### Acquire - File Acquiration @@ -87,7 +87,11 @@ pkgAcquire::~pkgAcquire() void pkgAcquire::Shutdown() { while (Items.size() != 0) + { + if (Items[0]->Status == Item::StatFetching) + Items[0]->Status = Item::StatError; delete Items[0]; + } while (Queues != 0) { @@ -113,13 +117,15 @@ void pkgAcquire::Remove(Item *Itm) { Dequeue(Itm); - for (ItemIterator I = Items.begin(); I != Items.end(); I++) + for (ItemIterator I = Items.begin(); I != Items.end();) { if (*I == Itm) { Items.erase(I); I = Items.begin(); } + else + I++; } } /*}}}*/ @@ -475,7 +481,7 @@ double pkgAcquire::PartialPresent() Total += (*I)->PartialSize; return Total; } - /*}}}*/ + // Acquire::UriBegin - Start iterator for the uri list /*{{{*/ // --------------------------------------------------------------------- /* */