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 da57f8d3b06e678078c87a0f7691f1597747a7e3..2401364a95b92dc56d428400f29ba23c65e3d5f1 100644 (file)
--- 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 91d176e3ca3a857f03f70ab725a72fda7f489590..bf865bdc46eea80357be7c0de85b31e51feeac8f 100644 (file)
--- 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",