From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 8 Oct 2014 06:37:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/expected-size' into debian/experimental
X-Git-Tag: 1.1.exp4~5
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0c158e03ceb509a08d3d4ded79c3151237f669dd?hp=-c

Merge remote-tracking branch 'mvo/feature/expected-size' into debian/experimental
---

0c158e03ceb509a08d3d4ded79c3151237f669dd
diff --combined apt-pkg/acquire-method.cc
index 8533e319f,c78e95e58..cfa93e95c
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -127,7 -127,7 +127,7 @@@ void pkgAcqMethod::Fail(string Err,boo
  /* */
  void pkgAcqMethod::DropPrivsOrDie()
  {
 -   if (!DropPrivs()) {
 +   if (!DropPrivileges()) {
        Fail(false);
        exit(112);	/* call the european emergency number */
     }
@@@ -375,6 -375,8 +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