X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7a7fa5f07e59bd17415cb0321d1f98527c2cfea4..30456e14d97be16516a5a84ce9bf9acba143da87:/apt-pkg/acquire-item.cc diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7cd43f4e6..59301784e 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.10 1998/11/12 04:10:52 jgg Exp $ +// $Id: acquire-item.cc,v 1.17 1998/12/11 06:32:33 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 /*{{{*/ @@ -18,6 +18,7 @@ #endif #include #include +#include #include #include @@ -31,7 +32,8 @@ // --------------------------------------------------------------------- /* */ pkgAcquire::Item::Item(pkgAcquire *Owner) : Owner(Owner), FileSize(0), - Mode(0), ID(0), Complete(false), QueueCounter(0) + Mode(0), ID(0), Complete(false), Local(false), + QueueCounter(0) { Owner->Add(this); Status = StatIdle; @@ -52,9 +54,19 @@ pkgAcquire::Item::~Item() void pkgAcquire::Item::Failed(string Message) { 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 */ + if (StringToBool(LookupTag(Message,"Transient-Failure"),false) == true) + { + Status = StatIdle; + Owner->Dequeue(this); + return; + } + Status = StatError; Owner->Dequeue(this); } @@ -145,9 +157,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 /*{{{*/ @@ -191,7 +203,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5) return; Decompression = true; - FileSize = 0; + Local = true; DestFile += ".decomp"; Desc.URI = "copy:" + FileName; QueueURI(Desc); @@ -213,7 +225,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5) if (FileName == DestFile) Erase = true; else - FileSize = 0; + Local = true; Decompression = true; DestFile += ".decomp"; @@ -222,6 +234,14 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5) Mode = "gzip"; } /*}}}*/ +// AcqIndex::Describe - Describe the Item /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string pkgAcqIndex::Describe() +{ + return Location->PackagesURI(); +} + /*}}}*/ // AcqIndexRel::pkgAcqIndexRel - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -257,9 +277,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 /*{{{*/ @@ -288,7 +308,7 @@ void pkgAcqIndexRel::Done(string Message,unsigned long Size,string MD5) // We have to copy it into place if (FileName != DestFile) { - FileSize = 0; + Local = true; Desc.URI = "copy:" + FileName; QueueURI(Desc); return; @@ -300,3 +320,167 @@ void pkgAcqIndexRel::Done(string Message,unsigned long Size,string MD5) Rename(DestFile,FinalFile); } /*}}}*/ +// AcqIndexRel::Describe - Describe the Item /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string pkgAcqIndexRel::Describe() +{ + return Location->ReleaseURI(); +} + /*}}}*/ + +// AcqArchive::AcqArchive - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, + pkgRecords *Recs,pkgCache::VerIterator const &Version, + string &StoreFilename) : + Item(Owner), Version(Version), Sources(Sources), Recs(Recs), + StoreFilename(StoreFilename), Vf(Version.FileList()) +{ + // Select a source + 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. */ +bool pkgAcqArchive::QueueNext() +{ + for (; Vf.end() == false; Vf++) + { + // Ignore not source sources + if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0) + continue; + + // Try to cross match against the source list + string PkgFile = flNotDir(Vf.File().FileName()); + pkgSourceList::const_iterator Location; + for (Location = Sources->begin(); Location != Sources->end(); Location++) + if (PkgFile == URItoFileName(Location->PackagesURI())) + break; + + if (Location == Sources->end()) + continue; + + // Grab the text package record + pkgRecords::Parser &Parse = Recs->Lookup(Vf); + if (_error->PendingError() == true) + return false; + + PkgFile = Parse.FileName(); + MD5 = Parse.MD5Hash(); + if (PkgFile.empty() == true) + 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. + FileSize = Version->Size; + string FinalFile = _config->FindDir("Dir::Cache::Archives") + flNotDir(PkgFile); + struct stat Buf; + 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(PkgFile); + + // Create the item + Desc.URI = Location->ArchiveURI(PkgFile); + Desc.Description = Location->ArchiveInfo(Version); + Desc.Owner = this; + Desc.ShortDesc = Version.ParentPkg().Name(); + QueueURI(Desc); + + Vf++; + return true; + } + return false; +} + /*}}}*/ +// AcqArchive::Done - Finished fetching /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash) +{ + Item::Done(Message,Size,MD5); + + // Check the size + if (Size != Version->Size) + { + _error->Error("Size mismatch for package %s",Version.ParentPkg().Name()); + return; + } + + // Check the md5 + if (Md5Hash.empty() == false && MD5.empty() == false) + { + if (Md5Hash != MD5) + { + _error->Error("MD5Sum mismatch for package %s",Version.ParentPkg().Name()); + return; + } + } + + // Grab the output filename + string FileName = LookupTag(Message,"Filename"); + if (FileName.empty() == true) + { + Status = StatError; + ErrorText = "Method gave a blank filename"; + return; + } + + Complete = true; + + // Reference filename + if (FileName != DestFile) + { + StoreFilename = DestFile = FileName; + Local = true; + return; + } + + // Done, move it into position + string FinalFile = _config->FindDir("Dir::Cache::Archives"); + FinalFile += flNotDir(DestFile); + Rename(DestFile,FinalFile); + + StoreFilename = DestFile = FinalFile; + Complete = true; +} + /*}}}*/ +// AcqArchive::Describe - Describe the Item /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string pkgAcqArchive::Describe() +{ + return Desc.URI; +} + /*}}}*/ +// AcqArchive::Failed - Failure handler /*{{{*/ +// --------------------------------------------------------------------- +/* Here we try other sources */ +void pkgAcqArchive::Failed(string Message) +{ + ErrorText = LookupTag(Message,"Message"); + if (QueueNext() == false) + Item::Failed(Message); +} + /*}}}*/