report warnings&errors consistently in edit-sources

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

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 120d061ad942816bce25739db05ec0fd8750b6ba..4a35e3847005bd32dcb4812bceb45a0f7aa62997 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -19,18 +19,19 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>

-#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/metaindex.h>

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

+#include <apt-pkg/debmetaindex.h>

 
 #include <iostream>
 
 #include <iostream>

-#include <sstream>

 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sstream>

 
 #include "indexcopy.h"
 #include <apti18n.h>
 
 #include "indexcopy.h"
 #include <apti18n.h>


@@ -89,7 +90,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
       
       // Open the output file
         return false;
       
       // Open the output file


@@ -106,7 +107,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       } else {
          Target.Open(TargetF,FileFd::WriteAtomic);
       }
       } else {
          Target.Open(TargetF,FileFd::WriteAtomic);
       }

-      if (_error->PendingError() == true)
+      if (Target.IsOpen() == false || Target.Failed())

         return false;
 
       // Setup the progress meter
         return false;
 
       // Setup the progress meter


@@ -424,7 +425,6 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size)
 // PackageCopy::RewriteEntry - Rewrite the entry with a new filename   /*{{{*/
 bool PackageCopy::RewriteEntry(FileFd &Target,string const &File)
 {
 // PackageCopy::RewriteEntry - Rewrite the entry with a new filename   /*{{{*/
 bool PackageCopy::RewriteEntry(FileFd &Target,string const &File)
 {

-   string const Dir(File,0,File.rfind('/'));

    std::vector<pkgTagSection::Tag> Changes;
    Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", File));
 
    std::vector<pkgTagSection::Tag> Changes;
    Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", File));
 


@@ -477,9 +477,9 @@ bool SourceCopy::RewriteEntry(FileFd &Target, std::string const &File)
 }
                                                                        /*}}}*/
 // SigVerify::Verify - Verify a files md5sum against its metaindex     /*{{{*/
 }
                                                                        /*}}}*/
 // SigVerify::Verify - Verify a files md5sum against its metaindex     /*{{{*/

-bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
+bool SigVerify::Verify(string prefix, string file, metaIndex *MetaIndex)

 {
 {

-   const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
+   const metaIndex::checkSum *Record = MetaIndex->Lookup(file);

    bool const Debug = _config->FindB("Debug::aptcdrom",false);
 
    // we skip non-existing files in the verifcation of the Release file
    bool const Debug = _config->FindB("Debug::aptcdrom",false);
 
    // we skip non-existing files in the verifcation of the Release file


@@ -546,11 +546,11 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
    // Read all Release files
    for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); ++I)
 
    // Read all Release files
    for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); ++I)

-   { 
+   {

       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 
       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 

-      indexRecords *MetaIndex = new indexRecords;
+      metaIndex *MetaIndex = new debReleaseIndex("","", {});

       string prefix = *I; 
 
       string const releasegpg = *I+"Release.gpg";
       string prefix = *I; 
 
       string const releasegpg = *I+"Release.gpg";


@@ -592,12 +592,13 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       }
 
       // Open the Release file and add it to the MetaIndex
       }
 
       // Open the Release file and add it to the MetaIndex

-      if(!MetaIndex->Load(release))
+      std::string ErrorText;
+      if(MetaIndex->Load(release, &ErrorText) == false)

       {
       {

-        _error->Error("%s",MetaIndex->ErrorText.c_str());
+        _error->Error("%s", ErrorText.c_str());

         return false;
       }
         return false;
       }

-      
+

       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();
       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();


@@ -682,7 +683,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
 
       // Open the output file
         return false;
 
       // Open the output file


@@ -699,7 +700,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       } else {
         Target.Open(TargetF,FileFd::WriteAtomic);
       }
       } else {
         Target.Open(TargetF,FileFd::WriteAtomic);
       }

-      if (_error->PendingError() == true)
+      if (Pkg.IsOpen() == false || Pkg.Failed())

         return false;
 
       // Setup the progress meter
         return false;
 
       // Setup the progress meter


@@ -770,14 +771,14 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-IndexCopy::IndexCopy() {}
+IndexCopy::IndexCopy() : d(nullptr), Section(nullptr) {}

 APT_CONST IndexCopy::~IndexCopy() {}
 
 APT_CONST IndexCopy::~IndexCopy() {}
 

-PackageCopy::PackageCopy() : IndexCopy() {}
+PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}

 APT_CONST PackageCopy::~PackageCopy() {}
 APT_CONST PackageCopy::~PackageCopy() {}

-SourceCopy::SourceCopy() : IndexCopy() {}
+SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}

 APT_CONST SourceCopy::~SourceCopy() {}
 APT_CONST SourceCopy::~SourceCopy() {}

-TranslationsCopy::TranslationsCopy() {}
+TranslationsCopy::TranslationsCopy() : d(nullptr), Section(nullptr) {}

 APT_CONST TranslationsCopy::~TranslationsCopy() {}
 APT_CONST TranslationsCopy::~TranslationsCopy() {}

-SigVerify::SigVerify() {}
+SigVerify::SigVerify() : d(NULL) {}

 APT_CONST SigVerify::~SigVerify() {}
 APT_CONST SigVerify::~SigVerify() {}