* cmdline/apt-get.cc:

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

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 502f454a8f21d7948a5acfe59bfbb948a71a7580..1fc27b1a148b80215027a1658e665a0c376a1c29 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -9,7 +9,7 @@
 #include <apt-pkg/strutl.h>
 #include <apti18n.h>
 #include <sys/stat.h>
 #include <apt-pkg/strutl.h>
 #include <apti18n.h>
 #include <sys/stat.h>

-
+                                                                       /*}}}*/

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


@@ -31,20 +31,20 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
    return Entries[MetaKey];
 }
 
    return Entries[MetaKey];
 }
 

-bool indexRecords::Load(const string Filename)
+bool indexRecords::Load(const string Filename)                         /*{{{*/

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

-      ErrorText = _(("Unable to parse Release file " + Filename).c_str());
+      strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());

       return false;
    }
 
    pkgTagSection Section;
    if (TagFile.Step(Section) == false)
    {
       return false;
    }
 
    pkgTagSection Section;
    if (TagFile.Step(Section) == false)
    {

-      ErrorText = _(("No sections in Release file " + Filename).c_str());
+      strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());

       return false;
    }
 
       return false;
    }
 


@@ -78,15 +78,15 @@ bool indexRecords::Load(const string Filename)
 
    if(HashString::SupportedHashes()[i] == NULL)
    {
 
    if(HashString::SupportedHashes()[i] == NULL)
    {

-      ErrorText = _(("No Hash entry in Release file " + Filename).c_str());
+      strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());

       return false;
    }  
 
    string Strdate = Section.FindS("Date"); // FIXME: verify this somehow?
    return true;
 }
       return false;
    }  
 
    string Strdate = Section.FindS("Date"); // FIXME: verify this somehow?
    return true;
 }

-
-vector<string> indexRecords::MetaKeys()
+                                                                       /*}}}*/
+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();


@@ -96,8 +96,8 @@ vector<string> indexRecords::MetaKeys()
    }
    return keys;
 }
    }
    return keys;
 }

-
-bool indexRecords::parseSumData(const char *&Start, const char *End,
+                                                                       /*}}}*/
+bool indexRecords::parseSumData(const char *&Start, const char *End,   /*{{{*/

                                   string &Name, string &Hash, size_t &Size)
 {
    Name = "";
                                   string &Name, string &Hash, size_t &Size)
 {
    Name = "";


@@ -154,7 +154,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,
    Start = EntryEnd; //prepare for the next round
    return true;
 }
    Start = EntryEnd; //prepare for the next round
    return true;
 }

-
+                                                                       /*}}}*/

 indexRecords::indexRecords()
 {
 }
 indexRecords::indexRecords()
 {
 }