Bug #807012 also involves package dependencies :/.

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

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 7a4f8177fa609eaa9ef3a14d0a13f2ffee5c547d..7d6e6f79c2e5b95d520fe7bec49b2219eec6c4aa 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -464,6 +464,7 @@ bool pkgAcquire::Worker::RunMessages()
               }
               else
               {
               }
               else
               {

+                 auto SavedDesc = Owner->GetItemDesc();

                  if (isDoomedItem(Owner) == false)
                  {
                     if (Message.find("\nFailReason:") == std::string::npos)
                  if (isDoomedItem(Owner) == false)
                  {
                     if (Message.find("\nFailReason:") == std::string::npos)


@@ -476,7 +477,7 @@ bool pkgAcquire::Worker::RunMessages()
                     Owner->Failed(Message,Config);
                  }
                  if (Log != nullptr)
                     Owner->Failed(Message,Config);
                  }
                  if (Log != nullptr)

-                    Log->Fail(Owner->GetItemDesc());
+                    Log->Fail(SavedDesc);

               }
            }
            ItemDone();
               }
            }
            ItemDone();


@@ -524,11 +525,11 @@ bool pkgAcquire::Worker::RunMessages()
                  Owner->Status = pkgAcquire::Item::StatAuthError;
               else if (errTransient)
                  Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
                  Owner->Status = pkgAcquire::Item::StatAuthError;
               else if (errTransient)
                  Owner->Status = pkgAcquire::Item::StatTransientNetworkError;

-
+              auto SavedDesc = Owner->GetItemDesc();

               if (isDoomedItem(Owner) == false)
                  Owner->Failed(Message,Config);
               if (Log != nullptr)
               if (isDoomedItem(Owner) == false)
                  Owner->Failed(Message,Config);
               if (Log != nullptr)

-                 Log->Fail(Owner->GetItemDesc());
+                 Log->Fail(SavedDesc);

            }
            ItemDone();
 
            }
            ItemDone();
 


@@ -660,36 +661,15 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    if (OutFd == -1)
       return false;
 
    if (OutFd == -1)
       return false;
 

-   HashStringList const hsl = Item->GetExpectedHashes();
-

    if (isDoomedItem(Item->Owner))
       return true;
 
    if (isDoomedItem(Item->Owner))
       return true;
 

-   if (hsl.usable() == false && Item->Owner->HashesRequired() &&
-        _config->Exists("Acquire::ForceHash") == false)
-   {
-      std::string const Message = "400 URI Failure"
-        "\nURI: " + Item->URI +
-        "\nFilename: " + Item->Owner->DestFile +
-        "\nFailReason: WeakHashSums";
-
-      auto const ItmOwners = Item->Owners;
-      for (auto &O: ItmOwners)
-      {
-        O->Status = pkgAcquire::Item::StatAuthError;
-        O->Failed(Message, Config);
-        if (Log != nullptr)
-           Log->Fail(O->GetItemDesc());
-      }
-      // "queued" successfully, the item just instantly failed
-      return true;
-   }
-

    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    Message += "\nFilename: " + Item->Owner->DestFile;
 
    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    Message += "\nFilename: " + Item->Owner->DestFile;
 

+   HashStringList const hsl = Item->GetExpectedHashes();

    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
 
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
 


@@ -712,7 +692,7 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    {
       std::string const SandboxUser = _config->Find("APT::Sandbox::User");
       ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),
    {
       std::string const SandboxUser = _config->Find("APT::Sandbox::User");
       ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),

-                                     SandboxUser.c_str(), "root", 0600);
+                                     SandboxUser.c_str(), ROOT_GROUP, 0600);

    }
 
    if (Debug == true)
    }
 
    if (Debug == true)


@@ -808,7 +788,7 @@ void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Que
 {
    if (RealFileExists(Itm->Owner->DestFile))
    {
 {
    if (RealFileExists(Itm->Owner->DestFile))
    {

-      ChangeOwnerAndPermissionOfFile(caller, Itm->Owner->DestFile.c_str(), "root", "root", 0644);
+      ChangeOwnerAndPermissionOfFile(caller, Itm->Owner->DestFile.c_str(), "root", ROOT_GROUP, 0644);

       std::string const filename = Itm->Owner->DestFile;
       for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
       {
       std::string const filename = Itm->Owner->DestFile;
       for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
       {