* apt-pkg/acquire-item.cc:

[apt.git] / apt-pkg / acquire-item.cc

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 8c519e3f7df0c97e9d3ae4b508b9eff60994eb50..14610d6e93c57ad2e616c95ecb51e755f787f8bc 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -24,8 +24,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/md5.h>

-#include <apt-pkg/sha1.h>
-#include <apt-pkg/tagfile.h>

 
 #include <apti18n.h>
     
 
 #include <apti18n.h>
     


@@ -33,7 +31,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string>
 #include <unistd.h>
 #include <errno.h>
 #include <string>

-#include <sstream>

 #include <stdio.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
                                                                        /*}}}*/
 


@@ -66,6 +63,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
    Status = StatIdle;
    ErrorText = LookupTag(Message,"Message");
 {
    Status = StatIdle;
    ErrorText = LookupTag(Message,"Message");

+   UsedMirror =  LookupTag(Message,"UsedMirror");

    if (QueueCounter <= 1)
    {
       /* This indicates that the file is not available right now but might
    if (QueueCounter <= 1)
    {
       /* This indicates that the file is not available right now but might


@@ -82,6 +80,13 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       Status = StatError;
       Dequeue();
    }   
       Status = StatError;
       Dequeue();
    }   

+   
+   // report mirror failure back to LP if we actually use a mirror
+   string FailReason = LookupTag(Message, "FailReason");
+   if(FailReason.size() != 0)
+      ReportMirrorFailure(FailReason);
+   else
+      ReportMirrorFailure(ErrorText);

 }
                                                                        /*}}}*/
 // Acquire::Item::Start - Item has begun to download                   /*{{{*/
 }
                                                                        /*}}}*/
 // Acquire::Item::Start - Item has begun to download                   /*{{{*/


@@ -103,6 +108,7 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string,
 {
    // We just downloaded something..
    string FileName = LookupTag(Message,"Filename");
 {
    // We just downloaded something..
    string FileName = LookupTag(Message,"Filename");

+   UsedMirror =  LookupTag(Message,"UsedMirror");

    if (Complete == false && FileName == DestFile)
    {
       if (Owner->Log != 0)
    if (Complete == false && FileName == DestFile)
    {
       if (Owner->Log != 0)


@@ -111,7 +117,6 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string,
 
    if (FileSize == 0)
       FileSize= Size;
 
    if (FileSize == 0)
       FileSize= Size;

-   

    Status = StatDone;
    ErrorText = string();
    Owner->Dequeue(this);
    Status = StatDone;
    ErrorText = string();
    Owner->Dequeue(this);


@@ -134,240 +139,46 @@ void pkgAcquire::Item::Rename(string From,string To)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-// AcqIndexDiffs::AcqIndexDiffs - Constructor                  
-// ---------------------------------------------------------------------
-/* The package diff is added to the queue. one object is constructed
- * for each diff and the index
- */
-pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
-                                  string URI,string URIDesc,string ShortDesc,
-                                  string ExpectedMD5, vector<string> diffs) 
-   : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), needed_files(diffs)
+void pkgAcquire::Item::ReportMirrorFailure(string FailCode)

 {
 {

-   
-   DestFile = _config->FindDir("Dir::State::lists") + "partial/";
-   DestFile += URItoFileName(URI);
-
-   Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
-
-   Desc.Description = URIDesc;
-   Desc.Owner = this;
-   Desc.ShortDesc = ShortDesc;
-
-   CurrentPackagesFile = _config->FindDir("Dir::State::lists");
-   CurrentPackagesFile += URItoFileName(RealURI);
-
-   if(Debug) {
-      std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " 
-               << CurrentPackagesFile << std::endl;
-   }
-
-   if(!FileExists(CurrentPackagesFile) || 
-      !_config->FindB("Acquire::Diffs",true)) {
-      // we don't have a pkg file or we don't want to queue
-      if(Debug)
-        std::clog << "No index file or canceld by user" << std::endl;
-      Failed("", NULL);
+   // we only act if a mirror was used at all
+   if(UsedMirror.empty())

       return;
       return;

-   }
-
-   if(needed_files.size() == 0)
-      QueueDiffIndex(URI);
-   else
-      QueueNextDiff();
-}
-
-void pkgAcqIndexDiffs::QueueDiffIndex(string URI)
-{
-   Desc.URI = URI + ".diff/Index";
-   Desc.Description = Description + "IndexDiff";
-   DestFile = _config->FindDir("Dir::State::lists") + "partial/";
-   DestFile += URItoFileName(URI) + string(".IndexDiff");
-
-   if(Debug)
-      std::clog << "QueueDiffIndex: " << Desc.URI << std::endl;
-
-   QueueURI(Desc);
-}
-
-void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
-{
-   if(Debug)
-      std::clog << "Failed(): " << Desc.URI << std::endl
-               << "Falling back to big package file" << std::endl;
-   new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, 
-                  ExpectedMD5);
-   Finish();
-}
-
-
-// helper that cleans the item out of the fetcher queue
-void pkgAcqIndexDiffs::Finish(bool allDone)
-{
-   // we restore the original name, this is required, otherwise
-   // the file will be cleaned
-   if(allDone) {
-      // this is for the "real" finish
-      DestFile = _config->FindDir("Dir::State::lists");
-      DestFile += URItoFileName(RealURI);
-      Complete = true;
-      Dequeue();
-      if(Debug)
-        std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl;
+#if 0
+   std::cerr << "\nReportMirrorFailure: " 
+            << UsedMirror
+            << " Uri: " << DescURI()
+            << " FailCode: " 
+            << FailCode << std::endl;
+#endif
+   const char *Args[40];
+   unsigned int i = 0;
+   string report = _config->Find("Methods::Mirror::ProblemReporting", 
+                                "/usr/bin/apt-report-mirror-failure");
+   if(!FileExists(report))

       return;
       return;

-
-   }
-
-   if(Debug)
-      std::clog << "Finishing: " << Desc.URI << std::endl;
-   Complete = false;
-   Status = StatDone;
-   Dequeue();
-   return;
-}
-
-
-// this needs to be rewriten to not depend on the external ed
-bool pkgAcqIndexDiffs::ApplyDiff(string PatchFile)
-{
-   char *error;
-   int res=0;
-
-   string FinalFile = _config->FindDir("Dir::State::lists");
-   FinalFile += URItoFileName(RealURI);
-
-   int Process = ExecFork();
-   if (Process == 0)
+   Args[i++] = report.c_str();
+   Args[i++] = UsedMirror.c_str();
+   Args[i++] = DescURI().c_str();
+   Args[i++] = FailCode.c_str();
+   Args[i++] = NULL;
+   pid_t pid = ExecFork();
+   if(pid < 0) 

    {
    {

-      chdir(_config->FindDir("Dir::State::lists").c_str());
-      string cmd = "(zcat " + PatchFile + "; echo \"wq\" ) | ed  " + FinalFile + " >/dev/null 2>/dev/null";
-      if(Debug)
-        std::clog << "Runing: " << cmd << std::endl;
-      res = system(cmd.c_str());
-      _exit(WEXITSTATUS(res));
-   }
-   if(!ExecWait(Process, error, true)) {
-      //_error->Error("Patch failed: %s ", error);
-      return false;
+      _error->Error("ReportMirrorFailure Fork failed");
+      return;

    }
    }

-
-   return true;
-}
-
-bool pkgAcqIndexDiffs::QueueNextDiff()
-{
-   // queue diff
-   Desc.URI = string(RealURI) + string(".diff/") + needed_files[0] + string(".gz");
-   Desc.Description = Description + string("-diff");
-
-   DestFile = _config->FindDir("Dir::State::lists") + "partial/";
-   DestFile += URItoFileName(RealURI + string(".diff/") + needed_files[0]);
-
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
-   
-   QueueURI(Desc);
-
-   return true;
-}
-
-bool pkgAcqIndexDiffs::ParseIndexDiff(string IndexDiffFile)
-{
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile 
-               << std::endl;
-   
-   FileFd Fd(IndexDiffFile,FileFd::ReadOnly);
-   pkgTagFile TF(&Fd);
-   if (_error->PendingError() == true)
-      return false;
-   pkgTagSection Tags;
-   if(TF.Step(Tags) == true)
+   else if(pid == 0) 

    {
    {

-      string local_sha1;
-      string tmp = Tags.FindS("SHA1-Current");
-      std::stringstream ss(tmp);
-      ss >> ServerSha1;
-
-      FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
-      SHA1Summation SHA1;
-      SHA1.AddFD(fd.Fd(), fd.Size());
-      local_sha1 = string(SHA1.Result());
-
-      if(local_sha1 == ServerSha1) {
-        if(Debug)
-           std::clog << "Package file is up-to-date" << std::endl;
-        Finish(true);
-        return true;
-      }
-      if(Debug)
-        std::clog << "SHA1-Current: " << ServerSha1 << std::endl;
-
-      // check the historie and see what patches we need
-      string history = Tags.FindS("SHA1-History");     
-      std::stringstream hist(history);
-      string sha1, size, file;
-      bool found = false;
-      while(hist >> sha1 >> size >> file) {
-        if(sha1 == local_sha1) 
-           found=true;
-        if(found) {
-           if(Debug)
-              std::clog << "Need to get diff: " << file << std::endl;
-           needed_files.push_back(file);
-        }
-      }
-      // no information how to get the patches, bail out
-      if(!found) {
-        if(Debug)
-           std::clog << "Can't find a patch in the index file" << std::endl;
-        // Failed will queue a big package file
-        Failed("", NULL);
-      } else {
-        // queue the diffs
-        new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
-                             ExpectedMD5, needed_files);
-        Finish();
-        return true;
-      }
+      execvp(Args[0], (char**)Args);
+      std::cerr << "Could not exec " << Args[0] << std::endl;
+      _exit(100);

    }
    }

-
-   return false;
-}
-
-
-void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
-                           pkgAcquire::MethodConfig *Cnf)
-{
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl;
-
-   Item::Done(Message,Size,Md5Hash,Cnf);
-
-   int len = Desc.URI.size();
-   // sucess in downloading the index
-   if(Desc.URI.substr(len-strlen("Index"),len-1) == "Index") {
-      if(!ParseIndexDiff(DestFile))
-        return Failed("", NULL);
-      else
-        return Finish();
-   }
-
-   // sucess in downloading a diff
-   if(Desc.URI.find(".diff") != string::npos) {
-      ApplyDiff(DestFile);
-      needed_files.erase(needed_files.begin());
-
-      if(needed_files.size() > 0) {
-        new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
-                             ExpectedMD5, needed_files);
-      } else {
-        Finish(true);
-        return;
-      }
+   if(!ExecWait(pid, "report-mirror-failure")) 
+   {
+      _error->Warning("Couldn't report problem to '%s'",
+                     _config->Find("Methods::Mirror::ProblemReporting").c_str());

    }
    }

-
-   Finish();

 }
 
 
 }
 
 


@@ -377,25 +188,26 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
    instantiated to fetch the revision file */   
 pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
                         string URI,string URIDesc,string ShortDesc,
    instantiated to fetch the revision file */   
 pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
                         string URI,string URIDesc,string ShortDesc,

-                        string ExpectedMD5, string comprExt)
-   : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5)
+                        string ExpectedMD5, string comprExt) :
+   Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5)

 {
    Decompression = false;
    Erase = false;
 {
    Decompression = false;
    Erase = false;

-   
+

    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
    if(comprExt.empty()) 
    {
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
    if(comprExt.empty()) 
    {

-      // autoselect 
-      if(FileExists("/usr/bin/bzip2"))
-        Desc.URI = URI + ".bz2"; 
-      else
-        Desc.URI = URI + ".gz"; 
+      // autoselect the compression method
+      if(FileExists("/bin/bzip2")) 
+        CompressionExtension = ".bz2";
+      else 
+        CompressionExtension = ".gz";

    } else {
    } else {

-      Desc.URI = URI + comprExt; 
+      CompressionExtension = comprExt;

    }
    }

+   Desc.URI = URI + CompressionExtension; 

 
    Desc.Description = URIDesc;
    Desc.Owner = this;
 
    Desc.Description = URIDesc;
    Desc.Owner = this;


@@ -415,7 +227,6 @@ string pkgAcqIndex::Custom600Headers()
    struct stat Buf;
    if (stat(Final.c_str(),&Buf) != 0)
       return "\nIndex-File: true";
    struct stat Buf;
    if (stat(Final.c_str(),&Buf) != 0)
       return "\nIndex-File: true";

-   

    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
                                                                        /*}}}*/
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
                                                                        /*}}}*/


@@ -423,7 +234,7 @@ string pkgAcqIndex::Custom600Headers()
 void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
    // no .bz2 found, retry with .gz
 void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
    // no .bz2 found, retry with .gz

-   if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") {
+   if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {

       Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; 
 
       // retry with a gzip one 
       Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; 
 
       // retry with a gzip one 


@@ -474,6 +285,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
          Status = StatAuthError;
          ErrorText = _("MD5Sum mismatch");
          Rename(DestFile,DestFile + ".FAILED");
          Status = StatAuthError;
          ErrorText = _("MD5Sum mismatch");
          Rename(DestFile,DestFile + ".FAILED");

+        ReportMirrorFailure("HashChecksumFailure");

          return;
       }
       // Done, move it into position
          return;
       }
       // Done, move it into position


@@ -529,7 +341,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
    else
       Local = true;
    
    else
       Local = true;
    

-   string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1);
+   string compExt = Desc.URI.substr(Desc.URI.size()-3);

    char *decompProg;
    if(compExt == "bz2") 
       decompProg = "bzip2";
    char *decompProg;
    if(compExt == "bz2") 
       decompProg = "bzip2";


@@ -554,10 +366,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
                             const vector<IndexTarget*>* IndexTargets,
                             indexRecords* MetaIndexParser) :
    Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI),
                             const vector<IndexTarget*>* IndexTargets,
                             indexRecords* MetaIndexParser) :
    Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI),

-   MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc)
+   MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc),
+   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)

 {
 {

-   this->MetaIndexParser = MetaIndexParser;
-   this->IndexTargets = IndexTargets;

    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 


@@ -629,8 +440,16 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
                                                                        /*}}}*/
 void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
                                                                        /*}}}*/
 void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {

-   // Delete any existing sigfile, so that this source isn't
-   // mistakenly trusted
+
+   // if we get a network error we fail gracefully
+   if(LookupTag(Message,"FailReason") == "Timeout" || 
+      LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+      LookupTag(Message,"FailReason") == "ConnectionRefused") {
+      Item::Failed(Message,Cnf);
+      return;
+   }
+
+   // Delete any existing sigfile when the acquire failed

    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
    unlink(Final.c_str());
 
    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
    unlink(Final.c_str());
 


@@ -656,11 +475,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
                                 string SigFile,
                                 const vector<struct IndexTarget*>* IndexTargets,
                                 indexRecords* MetaIndexParser) :
                                 string SigFile,
                                 const vector<struct IndexTarget*>* IndexTargets,
                                 indexRecords* MetaIndexParser) :

-  Item(Owner), RealURI(URI), SigFile(SigFile)
+   Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
+   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)

 {
 {

-   this->AuthPass = false;
-   this->MetaIndexParser = MetaIndexParser;
-   this->IndexTargets = IndexTargets;

    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 


@@ -752,6 +569,9 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
       return;
    }
 
       return;
    }
 

+   // see if the download was a IMSHit
+   IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
+

    Complete = true;
 
    string FinalFile = _config->FindDir("Dir::State::lists");
    Complete = true;
 
    string FinalFile = _config->FindDir("Dir::State::lists");


@@ -780,7 +600,7 @@ void pkgAcqMetaIndex::AuthDone(string Message)
       return;
    }
 
       return;
    }
 

-   if (!VerifyVendor())
+   if (!VerifyVendor(Message))

    {
       return;
    }
    {
       return;
    }


@@ -833,12 +653,12 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
       }
       
       // Queue Packages file
       }
       
       // Queue Packages file

-      new pkgAcqIndexDiffs(Owner, (*Target)->URI, (*Target)->Description,
-                          (*Target)->ShortDesc, ExpectedIndexMD5);
+      new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
+                      (*Target)->ShortDesc, ExpectedIndexMD5);

    }
 }
 
    }
 }
 

-bool pkgAcqMetaIndex::VerifyVendor()
+bool pkgAcqMetaIndex::VerifyVendor(string Message)

 {
 //    // Maybe this should be made available from above so we don't have
 //    // to read and parse it every time?
 {
 //    // Maybe this should be made available from above so we don't have
 //    // to read and parse it every time?


@@ -863,6 +683,22 @@ bool pkgAcqMetaIndex::VerifyVendor()
 //          break;
 //       }
 //    }
 //          break;
 //       }
 //    }

+   string::size_type pos;
+
+   // check for missing sigs (that where not fatal because otherwise we had
+   // bombed earlier)
+   string missingkeys;
+   string msg = _("There is no public key available for the "
+                 "following key IDs:\n");
+   pos = Message.find("NO_PUBKEY ");
+   if (pos != std::string::npos)
+   {
+      string::size_type start = pos+strlen("NO_PUBKEY ");
+      string Fingerprint = Message.substr(start, Message.find("\n")-start);
+      missingkeys += (Fingerprint);
+   }
+   if(!missingkeys.empty())
+      _error->Warning("%s", string(msg+missingkeys).c_str());

 
    string Transformed = MetaIndexParser->GetExpectedDist();
 
 
    string Transformed = MetaIndexParser->GetExpectedDist();
 


@@ -871,7 +707,7 @@ bool pkgAcqMetaIndex::VerifyVendor()
       Transformed = "experimental";
    }
 
       Transformed = "experimental";
    }
 

-   string::size_type pos = Transformed.rfind('/');
+   pos = Transformed.rfind('/');

    if (pos != string::npos)
    {
       Transformed = Transformed.substr(0, pos);
    if (pos != string::npos)
    {
       Transformed = Transformed.substr(0, pos);


@@ -917,10 +753,31 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
    if (AuthPass == true)
    {
 {
    if (AuthPass == true)
    {

-      // gpgv method failed
+      // if we fail the authentication but got the file via a IMS-Hit 
+      // this means that the file wasn't downloaded and that it might be
+      // just stale (server problem, proxy etc). we delete what we have
+      // queue it again without i-m-s 
+      // alternatively we could just unlink the file and let the user try again
+      if (IMSHit)
+      {
+        Complete = false;
+        Local = false;
+        AuthPass = false;
+        unlink(DestFile.c_str());
+
+        DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+        DestFile += URItoFileName(RealURI);
+        Desc.URI = RealURI;
+        QueueURI(Desc);
+        return;
+      }
+
+      // gpgv method failed 
+      ReportMirrorFailure("GPGFailure");

       _error->Warning("GPG error: %s: %s",
                       Desc.Description.c_str(),
                       LookupTag(Message,"Message").c_str());
       _error->Warning("GPG error: %s: %s",
                       Desc.Description.c_str(),
                       LookupTag(Message,"Message").c_str());

+

    }
 
    // No Release file was present, or verification failed, so fall
    }
 
    // No Release file was present, or verification failed, so fall


@@ -996,6 +853,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
       }
    }
 
       }
    }
 

+   // "allow-unauthenticated" restores apts old fetching behaviour
+   // that means that e.g. unauthenticated file:// uris are higher
+   // priority than authenticated http:// uris
+   if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
+      Trusted = false;
+

    // Select a source
    if (QueueNext() == false && _error->PendingError() == false)
       _error->Error(_("I wasn't able to locate file for the %s package. "
    // Select a source
    if (QueueNext() == false && _error->PendingError() == false)
       _error->Error(_("I wasn't able to locate file for the %s package. "


@@ -1132,7 +995,8 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash,
       {
         Status = StatError;
         ErrorText = _("MD5Sum mismatch");
       {
         Status = StatError;
         ErrorText = _("MD5Sum mismatch");

-        Rename(DestFile,DestFile + ".FAILED");
+        if(FileExists(DestFile))
+           Rename(DestFile,DestFile + ".FAILED");

         return;
       }
    }
         return;
       }
    }


@@ -1227,13 +1091,19 @@ void pkgAcqArchive::Finished()
 // ---------------------------------------------------------------------
 /* The file is added to the queue */
 pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
 // ---------------------------------------------------------------------
 /* The file is added to the queue */
 pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,

-                      unsigned long Size,string Dsc,string ShortDesc) :
+                      unsigned long Size,string Dsc,string ShortDesc,
+                      const string &DestDir, const string &DestFilename) :

                        Item(Owner), Md5Hash(MD5)
 {
    Retries = _config->FindI("Acquire::Retries",0);
    
                        Item(Owner), Md5Hash(MD5)
 {
    Retries = _config->FindI("Acquire::Retries",0);
    

-   DestFile = flNotDir(URI);
-   
+   if(!DestFilename.empty())
+      DestFile = DestFilename;
+   else if(!DestDir.empty())
+      DestFile = DestDir + "/" + flNotDir(URI);
+   else
+      DestFile = flNotDir(URI);
+

    // Create the item
    Desc.URI = URI;
    Desc.Description = Dsc;
    // Create the item
    Desc.URI = URI;
    Desc.Description = Dsc;


@@ -1253,7 +1123,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
       else
         PartialSize = Buf.st_size;
    }
       else
         PartialSize = Buf.st_size;
    }

-   
+

    QueueURI(Desc);
 }
                                                                        /*}}}*/
    QueueURI(Desc);
 }
                                                                        /*}}}*/