X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/dca1e241d1160635329c87ec987c47717bfce4a8..a3eaf9544039a9adfef159e8185f376f19b15c68:/apt-pkg/acquire.cc diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index c4dada5fd..a9a8b3396 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.42 1999/10/27 05:00:25 jgg Exp $ +// $Id: acquire.cc,v 1.44 1999/12/09 05:22:33 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -48,15 +48,15 @@ pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) Debug = _config->FindB("Debug::pkgAcquire",false); - // This is really a stupid place for this, but people whine so much.. + // This is really a stupid place for this struct stat St; if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 || S_ISDIR(St.st_mode) == 0) - _error->Error("Lists directory %s/partial is missing.", + _error->Error("Lists directory %spartial is missing.", _config->FindDir("Dir::State::lists").c_str()); if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 || S_ISDIR(St.st_mode) == 0) - _error->Error("Archive directory %s/partial is missing.", + _error->Error("Archive directory %spartial is missing.", _config->FindDir("Dir::Cache::Archives").c_str()); } /*}}}*/ @@ -105,6 +105,8 @@ void pkgAcquire::Add(Item *Itm) /* Remove an item from the acquire list. This is usually not used.. */ void pkgAcquire::Remove(Item *Itm) { + Dequeue(Itm); + for (vector::iterator I = Items.begin(); I < Items.end(); I++) { if (*I == Itm)