merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 448a76c27eea7dd1945bd28a490aeac9d586f1a8..e37a78cfb1fcbec16b38cc6ec4d2856fa3e047aa 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -10,11 +10,18 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/gpgv.h>
+

 #include <sys/stat.h>
 #include <clocale>
 
 #include <apti18n.h>
                                                                        /*}}}*/
 #include <sys/stat.h>
 #include <clocale>
 
 #include <apti18n.h>
                                                                        /*}}}*/

+
+using std::string;
+

 string indexRecords::GetDist() const
 {
    return this->Dist;
 string indexRecords::GetDist() const
 {
    return this->Dist;


@@ -38,7 +45,10 @@ time_t indexRecords::GetValidUntil() const
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {

-   return Entries[MetaKey];
+   std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
+   if (sum == Entries.end())
+      return NULL;
+   return sum->second;

 }
 
 bool indexRecords::Exists(string const &MetaKey) const
 }
 
 bool indexRecords::Exists(string const &MetaKey) const


@@ -48,7 +58,10 @@ bool indexRecords::Exists(string const &MetaKey) const
 
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
 
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {

-   FileFd Fd(Filename, FileFd::ReadOnly);
+   FileFd Fd;
+   if (OpenMaybeClearSignedFile(Filename, Fd) == false)
+      return false;
+

    pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
    if (_error->PendingError() == true)
    {
    pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
    if (_error->PendingError() == true)
    {


@@ -146,7 +159,7 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-vector<string> indexRecords::MetaKeys()                                        /*{{{*/
+std::vector<string> indexRecords::MetaKeys()                           /*{{{*/

 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();
 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();


@@ -164,7 +177,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,        /*{{{*/
    Hash = "";
    Size = 0;
    /* Skip over the first blank */
    Hash = "";
    Size = 0;
    /* Skip over the first blank */

-   while ((*Start == '\t' || *Start == ' ' || *Start == '\n')
+   while ((*Start == '\t' || *Start == ' ' || *Start == '\n' || *Start == '\r')

          && Start < End)
       Start++;
    if (Start >= End)
          && Start < End)
       Start++;
    if (Start >= End)


@@ -206,7 +219,8 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,        /*{{{*/
    
    EntryEnd = Start;
    /* Find the end of the third entry (the filename) */
    
    EntryEnd = Start;
    /* Find the end of the third entry (the filename) */

-   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && *EntryEnd != '\n')
+   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && 
+           *EntryEnd != '\n' && *EntryEnd != '\r')

          && EntryEnd < End)
       EntryEnd++;
 
          && EntryEnd < End)
       EntryEnd++;