Merge branch 'debian/sid' into debian/experimental

[apt.git] / ftparchive / writer.cc

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index db617e92ac9bfd43bd0f9aa3cf98a85023f34acf..ded8715f8b134fb72f3eb9d467a20f62cc67ecda 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -471,6 +471,8 @@ bool PackagesWriter::DoPackage(string FileName)
    {
       if (hs->HashType() == "MD5Sum")
         Changes.push_back(SetTFRewriteData("MD5sum", hs->HashValue().c_str()));
    {
       if (hs->HashType() == "MD5Sum")
         Changes.push_back(SetTFRewriteData("MD5sum", hs->HashValue().c_str()));

+      else if (hs->HashType() == "Checksum-FileSize")
+        continue;

       else
         Changes.push_back(SetTFRewriteData(hs->HashType().c_str(), hs->HashValue().c_str()));
    }
       else
         Changes.push_back(SetTFRewriteData(hs->HashType().c_str(), hs->HashValue().c_str()));
    }


@@ -785,7 +787,7 @@ bool SourcesWriter::DoPackage(string FileName)
 
          for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs)
         {
 
          for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs)
         {

-           if (hs->HashType() == "MD5Sum")
+           if (hs->HashType() == "MD5Sum" || hs->HashType() == "Checksum-FileSize")

               continue;
            char const * fieldname;
            std::ostream * out;
               continue;
            char const * fieldname;
            std::ostream * out;