X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/17caf1b19355813fa7a58828d4979ecf21b1e1f9..d89df07a5915bbee7d7a57983a83dfb284c0895c:/apt-pkg/acquire-item.cc?ds=sidebyside diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index beb4260ac..7e4ea5043 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.22 1999/02/01 02:22:11 jgg Exp $ +// $Id: acquire-item.cc,v 1.25 1999/02/27 22:29:11 jgg Exp $ /* ###################################################################### Acquire Item - Item to acquire @@ -339,7 +339,9 @@ void pkgAcqIndexRel::Failed(string Message,pkgAcquire::MethodConfig *Cnf) if (Cnf->LocalOnly == true || StringToBool(LookupTag(Message,"Transient-Failure"),false) == false) { - Status = StatIdle; + // Ignore this + Status = StatDone; + Complete = false; Dequeue(); return; } @@ -363,7 +365,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, // Generate the final file name as: package_version_arch.deb StoreFilename = QuoteString(Version.ParentPkg().Name(),"_:") + '_' + QuoteString(Version.VerStr(),"_:") + '_' + - QuoteString(Version.Arch(),"_:") + ".deb"; + QuoteString(Version.Arch(),"_:.") + ".deb"; // Select a source if (QueueNext() == false && _error->PendingError() == false) @@ -448,7 +450,7 @@ bool pkgAcqArchive::QueueNext() } DestFile = _config->FindDir("Dir::Cache::Archives") + "partial/" + flNotDir(StoreFilename); - + // Create the item Desc.URI = Location->ArchiveURI(PkgFile); Desc.Description = Location->ArchiveInfo(Version); @@ -541,6 +543,7 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) return; } + StoreFilename = string(); Item::Failed(Message,Cnf); } }