From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 14 Aug 2016 07:51:56 +0000 (+0200)
Subject: log with the failed item description, not with next try
X-Git-Tag: 1.3_rc2~14
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/850ad02657c096fb227b38ef6d691fcf20acd619?ds=inline

log with the failed item description, not with next try

The failure handling frequently changes URI & Description of the failed
item to try a slightly different combination which might work, but the
logging of the failure happens only afterwards as the same failure
handling decides if this is a critical error or not so we need a backup
here instead of potentially new content.

A purely cosmetic issue, but can still be confusing for humans.
---

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 7a4f8177f..aa1a2654e 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -464,6 +464,7 @@ bool pkgAcquire::Worker::RunMessages()
 	       }
 	       else
 	       {
+		  auto SavedDesc = Owner->GetItemDesc();
 		  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)
-		     Log->Fail(Owner->GetItemDesc());
+		     Log->Fail(SavedDesc);
 	       }
 	    }
 	    ItemDone();
@@ -524,11 +525,11 @@ bool pkgAcquire::Worker::RunMessages()
 		  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)
-		  Log->Fail(Owner->GetItemDesc());
+		  Log->Fail(SavedDesc);
 	    }
 	    ItemDone();