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 8a7df2eb38fd541dc5fba32890ea05c972385e4e..4a35e3847005bd32dcb4812bceb45a0f7aa62997 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -90,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


@@ -107,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


@@ -550,7 +550,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 
       if(Debug)
         cout << "Signature verify for: " << *I << endl;
 

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

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


@@ -683,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


@@ -700,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


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

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

 APT_CONST IndexCopy::~IndexCopy() {}
 
 PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}
 APT_CONST PackageCopy::~PackageCopy() {}
 SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}
 APT_CONST SourceCopy::~SourceCopy() {}
 APT_CONST IndexCopy::~IndexCopy() {}
 
 PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}
 APT_CONST PackageCopy::~PackageCopy() {}
 SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}
 APT_CONST SourceCopy::~SourceCopy() {}

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

 APT_CONST TranslationsCopy::~TranslationsCopy() {}
 SigVerify::SigVerify() : d(NULL) {}
 APT_CONST SigVerify::~SigVerify() {}
 APT_CONST TranslationsCopy::~TranslationsCopy() {}
 SigVerify::SigVerify() : d(NULL) {}
 APT_CONST SigVerify::~SigVerify() {}