summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-07-04 22:50:09 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-07-04 22:50:09 +0200
commit8e5d47a3a4e735835498574a58e0a33de04a0377 (patch)
treef55877de3ceb0c6c072a8aee492f563d110c0f85
parenta3b76cde9b0be9a83ca1548e8a6a91d26d8fa29e (diff)
* ftparchive/writer.cc:
- handle the APT::FTPArchive::Packages::SHA512 option correctly instead of overriding SHA256, thanks Christian Marillat! (Closes: #680252)
-rw-r--r--debian/changelog3
-rw-r--r--ftparchive/writer.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 11652d557..4fe8a800e 100644
--- 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 6a24fb8aa..3065526ad 100644
--- 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);