From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 5 Aug 2011 10:29:40 +0000 (+0200)
Subject: * test/integration/test-hashsum-verification:
X-Git-Tag: 0.8.15.6~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b1660aa192ff24747ac247805eda47b84a9cf933

* test/integration/test-hashsum-verification:
  - add regression test for hashsum verification
* apt-pkg/acquire-item.cc:
  - if no Release.gpg file is found, still load the hashes for
    verification (closes: #636314) and add test
---

b1660aa192ff24747ac247805eda47b84a9cf933
diff --cc apt-pkg/acquire-item.cc
index 215615bdd,ebd8d5a12..7eb5920e0
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -1258,8 -1258,9 +1258,9 @@@ void pkgAcqMetaIndex::Done(string Messa
        if (SigFile == "")
        {
           // There was no signature file, so we are finished.  Download
-          // the indexes without verification.
-          QueueIndexes(false);
 -         // the indexes and do hashsum verification
++         // the indexes and do only hashsum verification
+          MetaIndexParser->Load(DestFile);
+          QueueIndexes(true);
        }
        else
        {
diff --cc debian/changelog
index 75ac08328,f162e20f4..489960912
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,7 -11,11 +11,12 @@@ apt (0.8.15.5.6) UNRELEASED; urgency=lo
      - use ref-to-ptr semantic in NewDepends() to ensure that the   
        libapt does not segfault if the cache is remapped in between
        (LP: #812862)
 +    - fix crash when P.Arch() was used but the cache got remapped
+   * test/integration/test-hashsum-verification:
+     - add regression test for hashsum verification
+   * apt-pkg/acquire-item.cc:
+     - if no Release.gpg file is found, still load the hashes for
+       verification (closes: #636314) and add test
  
   -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200