From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 7 Oct 2014 18:06:44 +0000 (+0200)
Subject: Merge branch 'feature/acq-trans' into feature/expected-size
X-Git-Tag: 1.1.exp4~5^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7e4dfb4349e909c15b1c777679fdae81d76eeb62?ds=inline;hp=-c

Merge branch 'feature/acq-trans' into feature/expected-size
---

7e4dfb4349e909c15b1c777679fdae81d76eeb62
diff --combined apt-pkg/acquire-worker.cc
index ffa84eb68,4a357bdab..64df3c80f
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@@ -371,7 -371,8 +371,8 @@@ bool pkgAcquire::Worker::RunMessages(
  	 {
  	    if (Itm == 0)
  	    {
- 	       _error->Error("Method gave invalid 400 URI Failure message");
+ 	       std::string const msg = LookupTag(Message,"Message");
+ 	       _error->Error("Method gave invalid 400 URI Failure message: %s", msg.c_str());
  	       break;
  	    }
  
@@@ -533,12 -534,6 +534,12 @@@ bool pkgAcquire::Worker::QueueItem(pkgA
     HashStringList const hsl = Item->Owner->HashSums();
     for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
        Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
 +   if(Item->Owner->FileSize > 0)
 +   {
 +      string MaximumSize;
 +      strprintf(MaximumSize, "%llu", Item->Owner->FileSize);
 +      Message += "\nMaximum-Size: " + MaximumSize;
 +   }
     Message += Item->Owner->Custom600Headers();
     Message += "\n\n";