From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 8 Oct 2014 06:05:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'donkult/feature/acq-trans' into feature/expected-size
X-Git-Tag: 1.1.exp4~5^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/676700504710013d6737f79bf6ad12003d55c30d?hp=-c

Merge remote-tracking branch 'donkult/feature/acq-trans' into feature/expected-size
---

676700504710013d6737f79bf6ad12003d55c30d
diff --combined apt-pkg/acquire-method.cc
index 9c0558223,cbcbea247..c78e95e58
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -102,7 -102,10 +102,10 @@@ void pkgAcqMethod::Fail(string Err,boo
     if (Queue != 0)
     {
        std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n"
- 		<< "Message: " << Err << " " << IP << "\n";
+ 		<< "Message: " << Err;
+       if (IP.empty() == false && _config->FindB("Acquire::Failure::ShowIP", true) == true)
+ 	 std::cout << " " << IP;
+       std::cout << "\n";
        Dequeue();
     }
     else
@@@ -372,8 -375,6 +375,8 @@@ int pkgAcqMethod::Run(bool Single
  	       if (hash.empty() == false)
  		  Tmp->ExpectedHashes.push_back(HashString(*t, hash));
  	    }
 +            char *End;
 +            Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);
  	    Tmp->Next = 0;
  	    
  	    // Append it to the list