X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f19d6a77f60b876e5453614d24886aabdd242ef6..08b7761a251a36fa65cbe022a86c51d7f091a88d:/apt-pkg/acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 176772dde..f901847f7 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -23,6 +23,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 
+#include <algorithm>
 #include <string>
 #include <vector>
 #include <iostream>
@@ -41,29 +42,16 @@
 using namespace std;
 
 // Worker::Worker - Constructor for Queue startup			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
-			   pkgAcquireStatus *log) : d(NULL), Log(log)
+pkgAcquire::Worker::Worker(Queue *Q, MethodConfig *Cnf, pkgAcquireStatus *log) :
+   d(NULL), OwnerQ(Q), Log(log), Config(Cnf), Access(Cnf->Access),
+   CurrentItem(nullptr), CurrentSize(0), TotalSize(0)
 {
-   OwnerQ = Q;
-   Config = Cnf;
-   Access = Cnf->Access;
-   CurrentItem = 0;
-   TotalSize = 0;
-   CurrentSize = 0;
-
    Construct();
 }
 									/*}}}*/
 // Worker::Worker - Constructor for method config startup		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(MethodConfig *Cnf) : d(NULL), OwnerQ(NULL), Config(Cnf),
-						Access(Cnf->Access), CurrentItem(NULL),
-						CurrentSize(0), TotalSize(0)
+pkgAcquire::Worker::Worker(MethodConfig *Cnf) : Worker(nullptr, Cnf, nullptr)
 {
-   Construct();
 }
 									/*}}}*/
 // Worker::Construct - Constructor helper				/*{{{*/
@@ -254,8 +242,8 @@ bool pkgAcquire::Worker::RunMessages()
 	    ItemDone();
 
 	    // Change the status so that it can be dequeued
-	    for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
-	       (*O)->Status = pkgAcquire::Item::StatIdle;
+	    for (auto const &O: Itm->Owners)
+	       O->Status = pkgAcquire::Item::StatIdle;
 	    // Mark the item as done (taking care of all queues)
 	    // and then put it in the main queue again
 	    std::vector<Item*> const ItmOwners = Itm->Owners;
@@ -289,6 +277,10 @@ bool pkgAcquire::Worker::RunMessages()
 	    }
             break;
          }
+	 // 104 Warning
+	 case 104:
+	    _error->Warning("%s: %s", Itm->Owner->DescURI().c_str(), LookupTag(Message,"Message").c_str());
+	    break;
 
 	 // 200 URI Start
 	 case 200:
@@ -407,7 +399,13 @@ bool pkgAcquire::Worker::RunMessages()
 	       else if (Owner->HashesRequired() == true)
 		  consideredOkay = false;
 	       else
+	       {
 		  consideredOkay = true;
+		  // even if the hashes aren't usable to declare something secure
+		  // we can at least use them to declare it an integrity failure
+		  if (ExpectedHashes.empty() == false && ReceivedHashes != ExpectedHashes && _config->Find("Acquire::ForceHash").empty())
+		     consideredOkay = false;
+	       }
 
 	       if (consideredOkay == true)
 		  consideredOkay = Owner->VerifyDone(Message, Config);
@@ -457,15 +455,18 @@ bool pkgAcquire::Worker::RunMessages()
 	    OwnerQ->ItemDone(Itm);
 	    Itm = NULL;
 
+	    bool errTransient;
+	    {
+	       std::string const failReason = LookupTag(Message, "FailReason");
+	       std::string const reasons[] = { "Timeout", "ConnectionRefused",
+		  "ConnectionTimedOut", "ResolveFailure", "TmpResolveFailure" };
+	       errTransient = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+	    }
+
 	    for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
 	    {
-	       // set some status
-	       if(LookupTag(Message,"FailReason") == "Timeout" ||
-		     LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
-		     LookupTag(Message,"FailReason") == "ResolveFailure" ||
-		     LookupTag(Message,"FailReason") == "ConnectionRefused")
+	       if (errTransient)
 		  (*O)->Status = pkgAcquire::Item::StatTransientNetworkError;
-
 	       (*O)->Failed(Message,Config);
 
 	       if (Log != 0)
@@ -629,7 +630,7 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
 
    if (RealFileExists(Item->Owner->DestFile))
    {
-      std::string SandboxUser = _config->Find("APT::Sandbox::User");
+      std::string const SandboxUser = _config->Find("APT::Sandbox::User");
       ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),
                                      SandboxUser.c_str(), "root", 0600);
    }
@@ -732,9 +733,9 @@ void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Que
       for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
       {
 	 pkgAcquire::Item const * const Owner = *O;
-	 if (Owner->DestFile == filename)
+	 if (Owner->DestFile == filename || filename == "/dev/null")
 	    continue;
-	 unlink(Owner->DestFile.c_str());
+	 RemoveFile("PrepareFiles", Owner->DestFile);
 	 if (link(filename.c_str(), Owner->DestFile.c_str()) != 0)
 	 {
 	    // different mounts can't happen for us as we download to lists/ by default,
@@ -749,7 +750,7 @@ void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Que
    else
    {
       for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
-	 unlink((*O)->DestFile.c_str());
+	 RemoveFile("PrepareFiles", (*O)->DestFile);
    }
 }
 									/*}}}*/