* ftparchive/writer.cc:

  - handle the APT::FTPArchive::Packages::SHA512 option correctly instead
    of overriding SHA256, thanks Christian Marillat! (Closes: #680252)

diff --git a/debian/changelog b/debian/changelog
index 11652d5575e32e2b055d57f8abda4300f40fba89..4fe8a800e16e4014ed9e54227ca06db736f626ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ apt (0.9.7.2) UNRELEASED; urgency=low
   * debian/apt.cron.daily:
     - do not try to backup extended_states file if it doesn't
       exist (Closes: #680287)
+  * ftparchive/writer.cc:
+    - handle the APT::FTPArchive::Packages::SHA512 option correctly instead
+      of overriding SHA256, thanks Christian Marillat! (Closes: #680252)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 01 Jul 2012 08:20:57 +0200
 

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 6a24fb8aabc323b8ca609382617abdaae56a134c..3065526ad396ab2d8aced022d8ac24bf005eca20 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -318,7 +318,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c
    DoMD5 = _config->FindB("APT::FTPArchive::Packages::MD5",DoMD5);
    DoSHA1 = _config->FindB("APT::FTPArchive::Packages::SHA1",DoSHA1);
    DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA256",DoSHA256);
-   DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA512",true);
+   DoSHA512 = _config->FindB("APT::FTPArchive::Packages::SHA512",DoSHA512);
    DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false);
    DoContents = _config->FindB("APT::FTPArchive::Contents",true);
    NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);