X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a656821931a863ffcf46a719a57206eb0d2b11b3..70777d4b589007eeb840d9a67934f1e648f302d7:/apt-pkg/acquire-item.cc diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 532d4e6f2..ddaf260ea 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-item.cc,v 1.12 1998/11/13 07:08:48 jgg Exp $ +// $Id: acquire-item.cc,v 1.40 1999/10/31 06:32:27 jgg Exp $ /* ###################################################################### Acquire Item - Item to acquire @@ -9,7 +9,7 @@ cannot create an item that fetches two uri's to two files at the same time. The pkgAcqIndex class creates a second class upon instantiation to fetch the other index files because of this. - + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -19,7 +19,8 @@ #include #include #include -#include +#include +#include #include #include @@ -32,8 +33,8 @@ // --------------------------------------------------------------------- /* */ pkgAcquire::Item::Item(pkgAcquire *Owner) : Owner(Owner), FileSize(0), - Mode(0), ID(0), Complete(false), Local(false), - QueueCounter(0) + PartialSize(0), Mode(0), ID(0), Complete(false), + Local(false), QueueCounter(0) { Owner->Add(this); Status = StatIdle; @@ -51,21 +52,33 @@ pkgAcquire::Item::~Item() // --------------------------------------------------------------------- /* We return to an idle state if there are still other queues that could fetch this object */ -void pkgAcquire::Item::Failed(string Message) +void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { Status = StatIdle; + ErrorText = LookupTag(Message,"Message"); if (QueueCounter <= 1) { - ErrorText = LookupTag(Message,"Message"); + /* This indicates that the file is not available right now but might + be sometime later. If we do a retry cycle then this should be + retried [CDROMs] */ + if (Cnf->LocalOnly == true && + StringToBool(LookupTag(Message,"Transient-Failure"),false) == true) + { + Status = StatIdle; + Dequeue(); + return; + } + Status = StatError; - Owner->Dequeue(this); + Dequeue(); } } /*}}}*/ // Acquire::Item::Start - Item has begun to download /*{{{*/ // --------------------------------------------------------------------- -/* */ -void pkgAcquire::Item::Start(string Message,unsigned long Size) +/* Stash status and the file size. Note that setting Complete means + sub-phases of the acquire process such as decompresion are operating */ +void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size) { Status = StatFetching; if (FileSize == 0 && Complete == false) @@ -84,6 +97,9 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string) if (Owner->Log != 0) Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str())); } + + if (FileSize == 0) + FileSize= Size; Status = StatDone; ErrorText = string(); @@ -120,7 +136,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,const pkgSourceList::Item *Location) DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(Location->PackagesURI()); - // Create the item + // Create the item Desc.URI = Location->PackagesURI() + ".gz"; Desc.Description = Location->PackagesInfo(); Desc.Owner = this; @@ -147,9 +163,9 @@ string pkgAcqIndex::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) - return string(); + return "\nIndex-File: true"; - return "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); + return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ // AcqIndex::Done - Finished a fetch /*{{{*/ @@ -259,9 +275,9 @@ string pkgAcqIndexRel::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) - return string(); + return "\nIndex-File: true"; - return "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); + return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ // AcqIndexRel::Done - Item downloaded OK /*{{{*/ @@ -302,16 +318,64 @@ void pkgAcqIndexRel::Done(string Message,unsigned long Size,string MD5) Rename(DestFile,FinalFile); } /*}}}*/ +// AcqIndexRel::Failed - Silence failure messages for missing rel files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqIndexRel::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if (Cnf->LocalOnly == true || + StringToBool(LookupTag(Message,"Transient-Failure"),false) == false) + { + // Ignore this + Status = StatDone; + Complete = false; + Dequeue(); + return; + } + + Item::Failed(Message,Cnf); +} + /*}}}*/ // AcqArchive::AcqArchive - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* */ +/* This just sets up the initial fetch environment and queues the first + possibilitiy */ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, - pkgRecords *Recs,pkgCache::VerIterator const &Version) : - Item(Owner), Version(Version), Sources(Sources), Recs(Recs) + pkgRecords *Recs,pkgCache::VerIterator const &Version, + string &StoreFilename) : + Item(Owner), Version(Version), Sources(Sources), Recs(Recs), + StoreFilename(StoreFilename), Vf(Version.FileList()) { + Retries = _config->FindI("Acquire::Retries",0); + + if (Version.Arch() == 0) + { + _error->Error("I wasn't able to locate file for the %s package. " + "This might mean you need to manually fix this package. (due to missing arch)", + Version.ParentPkg().Name()); + return; + } + + // Generate the final file name as: package_version_arch.deb + StoreFilename = QuoteString(Version.ParentPkg().Name(),"_:") + '_' + + QuoteString(Version.VerStr(),"_:") + '_' + + QuoteString(Version.Arch(),"_:.") + ".deb"; + // Select a source - pkgCache::VerFileIterator Vf = Version.FileList(); + if (QueueNext() == false && _error->PendingError() == false) + _error->Error("I wasn't able to locate file for the %s package. " + "This might mean you need to manually fix this package.", + Version.ParentPkg().Name()); +} + /*}}}*/ +// AcqArchive::QueueNext - Queue the next file source /*{{{*/ +// --------------------------------------------------------------------- +/* This queues the next available file version for download. It checks if + the archive is already available in the cache and stashs the MD5 for + checking later. */ +bool pkgAcqArchive::QueueNext() +{ for (; Vf.end() == false; Vf++) { // Ignore not source sources @@ -331,19 +395,16 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, // Grab the text package record pkgRecords::Parser &Parse = Recs->Lookup(Vf); if (_error->PendingError() == true) - return; + return false; PkgFile = Parse.FileName(); MD5 = Parse.MD5Hash(); if (PkgFile.empty() == true) - { - _error->Error("Unable to locate a file name for package %s, " - "perhaps the package files are corrupted.", - Version.ParentPkg().Name()); - return; - } + return _error->Error("The package index files are corrupted. No Filename: " + "field for package %s." + ,Version.ParentPkg().Name()); - // See if we already have the file. + // See if we already have the file. (Legacy filenames) FileSize = Version->Size; string FinalFile = _config->FindDir("Dir::Cache::Archives") + flNotDir(PkgFile); struct stat Buf; @@ -355,16 +416,45 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, Complete = true; Local = true; Status = StatDone; - DestFile = FinalFile; - return; + StoreFilename = DestFile = FinalFile; + return true; + } + + /* Hmm, we have a file and its size does not match, this means it is + an old style mismatched arch */ + unlink(FinalFile.c_str()); + } + + // Check it again using the new style output filenames + FinalFile = _config->FindDir("Dir::Cache::Archives") + flNotDir(StoreFilename); + if (stat(FinalFile.c_str(),&Buf) == 0) + { + // Make sure the size matches + if ((unsigned)Buf.st_size == Version->Size) + { + Complete = true; + Local = true; + Status = StatDone; + StoreFilename = DestFile = FinalFile; + return true; } /* Hmm, we have a file and its size does not match, this shouldnt happen.. */ unlink(FinalFile.c_str()); } + + DestFile = _config->FindDir("Dir::Cache::Archives") + "partial/" + flNotDir(StoreFilename); - DestFile = _config->FindDir("Dir::Cache::Archives") + "partial/" + flNotDir(PkgFile); + // Check the destination file + if (stat(DestFile.c_str(),&Buf) == 0) + { + // Hmm, the partial file is too big, erase it + if ((unsigned)Buf.st_size > Version->Size) + unlink(DestFile.c_str()); + else + PartialSize = Buf.st_size; + } // Create the item Desc.URI = Location->ArchiveURI(PkgFile); @@ -372,26 +462,25 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, Desc.Owner = this; Desc.ShortDesc = Version.ParentPkg().Name(); QueueURI(Desc); - - return; + + Vf++; + return true; } - - _error->Error("I wasn't able to locate file for the %s package. " - "This probably means you need to rerun update.", - Version.ParentPkg().Name()); -} + return false; +} /*}}}*/ // AcqArchive::Done - Finished fetching /*{{{*/ // --------------------------------------------------------------------- /* */ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash) { - Item::Done(Message,Size,MD5); + Item::Done(Message,Size,Md5Hash); // Check the size if (Size != Version->Size) { - _error->Error("Size mismatch for package %s",Version.ParentPkg().Name()); + Status = StatError; + ErrorText = "Size mismatch"; return; } @@ -400,7 +489,9 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash) { if (Md5Hash != MD5) { - _error->Error("MD5Sum mismatch for package %s",Version.ParentPkg().Name()); + Status = StatError; + ErrorText = "MD5Sum mismatch"; + Rename(DestFile,DestFile + ".FAILED"); return; } } @@ -415,21 +506,173 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash) } Complete = true; - - // We have to copy it into place + + // Reference filename if (FileName != DestFile) { - DestFile = FileName; + StoreFilename = DestFile = FileName; Local = true; return; } // Done, move it into position string FinalFile = _config->FindDir("Dir::Cache::Archives"); - FinalFile += flNotDir(DestFile); + FinalFile += flNotDir(StoreFilename); Rename(DestFile,FinalFile); - DestFile = FinalFile; + StoreFilename = DestFile = FinalFile; + Complete = true; +} + /*}}}*/ +// AcqArchive::Failed - Failure handler /*{{{*/ +// --------------------------------------------------------------------- +/* Here we try other sources */ +void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + ErrorText = LookupTag(Message,"Message"); + if (QueueNext() == false) + { + // This is the retry counter + if (Retries != 0 && + Cnf->LocalOnly == false && + StringToBool(LookupTag(Message,"Transient-Failure"),false) == true) + { + Retries--; + Vf = Version.FileList(); + if (QueueNext() == true) + return; + } + + StoreFilename = string(); + Item::Failed(Message,Cnf); + } +} + /*}}}*/ +// AcqArchive::Finished - Fetching has finished, tidy up /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqArchive::Finished() +{ + if (Status == pkgAcquire::Item::StatDone && + Complete == true) + return; + StoreFilename = string(); +} + /*}}}*/ + +// AcqFile::pkgAcqFile - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* The file is added to the queue */ +pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, + unsigned long Size,string Dsc,string ShortDesc) : + Item(Owner), Md5Hash(MD5) +{ + Retries = _config->FindI("Acquire::Retries",0); + + DestFile = flNotDir(URI); + + // Create the item + Desc.URI = URI; + Desc.Description = Dsc; + Desc.Owner = this; + + // Set the short description to the archive component + Desc.ShortDesc = ShortDesc; + + // Get the transfer sizes + FileSize = Size; + struct stat Buf; + if (stat(DestFile.c_str(),&Buf) == 0) + { + // Hmm, the partial file is too big, erase it + if ((unsigned)Buf.st_size > Size) + unlink(DestFile.c_str()); + else + PartialSize = Buf.st_size; + } + + QueueURI(Desc); +} + /*}}}*/ +// AcqFile::Done - Item downloaded OK /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqFile::Done(string Message,unsigned long Size,string MD5) +{ + // Check the md5 + if (Md5Hash.empty() == false && MD5.empty() == false) + { + if (Md5Hash != MD5) + { + Status = StatError; + ErrorText = "MD5Sum mismatch"; + Rename(DestFile,DestFile + ".FAILED"); + return; + } + } + + Item::Done(Message,Size,MD5); + + string FileName = LookupTag(Message,"Filename"); + if (FileName.empty() == true) + { + Status = StatError; + ErrorText = "Method gave a blank filename"; + return; + } + Complete = true; + + // The files timestamp matches + if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) + return; + + // We have to copy it into place + if (FileName != DestFile) + { + Local = true; + if (_config->FindB("Acquire::Source-Symlinks",true) == false) + { + Desc.URI = "copy:" + FileName; + QueueURI(Desc); + return; + } + + // Erase the file if it is a symlink so we can overwrite it + struct stat St; + if (lstat(DestFile.c_str(),&St) == 0) + { + if (S_ISLNK(St.st_mode) != 0) + unlink(DestFile.c_str()); + } + + // Symlink the file + if (symlink(FileName.c_str(),DestFile.c_str()) != 0) + { + ErrorText = "Link to " + DestFile + " failure "; + Status = StatError; + Complete = false; + } + } +} + /*}}}*/ +// AcqFile::Failed - Failure handler /*{{{*/ +// --------------------------------------------------------------------- +/* Here we try other sources */ +void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + ErrorText = LookupTag(Message,"Message"); + + // This is the retry counter + if (Retries != 0 && + Cnf->LocalOnly == false && + StringToBool(LookupTag(Message,"Transient-Failure"),false) == true) + { + Retries--; + QueueURI(Desc); + return; + } + + Item::Failed(Message,Cnf); } /*}}}*/