From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 26 Sep 2014 16:09:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'donkult/feature/generalize-gzipindex' into debian/sid
X-Git-Tag: 1.0.9.2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/48fd4181ad0261d5f3e8894dcbfccfaea1530645?hp=5f982b9d903b38bb5549479f0111d31e2695090c

Merge remote-tracking branch 'donkult/feature/generalize-gzipindex' into debian/sid
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index da57f8d3b..2401364a9 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1144,6 +1144,12 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
    else
       Local = true;
 
+   // do not reverify cdrom sources as apt-cdrom may rewrite the Packages
+   // file when its doing the indexcopy
+   if (RealURI.substr(0,6) == "cdrom:" &&
+       StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
+      return;
+
    // The files timestamp matches, for non-local URLs reverify the local
    // file, for local file, uncompress again to ensure the hashsum is still
    // matching the Release file
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 91d176e3c..bf865bdc4 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -526,7 +526,7 @@ static const char *iTFRewritePackageOrder[] = {
                           "Conffiles",
                           "Filename",
                           "Size",
-                          "MD5Sum",
+                          "MD5sum",
                           "SHA1",
                           "SHA256",
                           "SHA512",