merged lp:~mvo/apt/hash-order

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 665dd427ef68af3075ed58b899abcd2d1d851dee..89ca6c670fbebb07c695ae68520d814d6c976c56 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1741,7 +1741,7 @@ bool pkgAcqArchive::QueueNext()
       {
         if(stringcasecmp(ForceHash, "sha512") == 0)
            ExpectedHash = HashString("SHA512", Parse.SHA512Hash());
-        if(stringcasecmp(ForceHash, "sha256") == 0)
+        else if(stringcasecmp(ForceHash, "sha256") == 0)
            ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
         else if (stringcasecmp(ForceHash, "sha1") == 0)
            ExpectedHash = HashString("SHA1", Parse.SHA1Hash());

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1bb981b20566624355eebc21d6e95158ee1f37e4..e3c74a0994dd5a720eae1570bfc121699f418db8 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2395,7 +2395,7 @@ bool DoDownload(CommandLine &CmdL)
       HashString hash;
       if (rec.SHA512Hash() != "")
          hash = HashString("sha512", rec.SHA512Hash());
-      if (rec.SHA256Hash() != "")
+      else if (rec.SHA256Hash() != "")
          hash = HashString("sha256", rec.SHA256Hash());
       else if (rec.SHA1Hash() != "")
          hash = HashString("sha1", rec.SHA1Hash());

diff --git a/debian/changelog b/debian/changelog
index 36b5bd9d11a915b1e1fe62704af1c45287b5e7be..792b120945e3d5e3fe0b048b49c5d25df6eeb724 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low
       works for redirected stdin
     - print error in log if tcgetattr() fails instead of writing
       a empty file
+  * use sha512 when available (LP: #1098752)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
 
 apt (0.9.7.8) UNRELEASED; urgency=low