merge with debian-experimental 0.8.16~exp2 release

[apt.git] / apt-pkg / indexrecords.cc

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index eb9a368662e9f8b192a8513ce9db6fdc6ef1c2fd..10e154ad2305b33c1887bace3777d846d61604b5 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -55,14 +55,17 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
    }
 
    pkgTagSection Section;
-   if (TagFile.Step(Section) == false)
-   {
-      strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
-      return false;
-   }
-
    const char *Start, *End;
-   Section.Get (Start, End, 0);
+   // Skip over sections beginning with ----- as this is an idicator for clearsigns
+   do {
+      if (TagFile.Step(Section) == false)
+      {
+        strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
+        return false;
+      }
+
+      Section.Get (Start, End, 0);
+   } while (End - Start > 5 && strncmp(Start, "-----", 5) == 0);
 
    Suite = Section.FindS("Suite");
    Dist = Section.FindS("Codename");