add a few gcc helpers, including [un]likely() and __deprecated

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

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 15696585a513544adf04030d172527e2a197429a..53eb111722fc9f9c383f4eddcef12ffb34ea4958 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -275,7 +275,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)

-      _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+      _error->Warning("A lot of entries were discarded, something may be wrong.\n");

    
 
    return true;
    
 
    return true;


@@ -527,19 +527,19 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
    // (non-existing files are not considered a error)
    if(!FileExists(prefix+file))
    {
    // (non-existing files are not considered a error)
    if(!FileExists(prefix+file))
    {

-      _error->Warning("Skipping non-exisiting file %s", string(prefix+file).c_str());
+      _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());

       return true;
    }
 
    if (!Record) 
    {
       return true;
    }
 
    if (!Record) 
    {

-      _error->Warning("Can't find authentication record for: %s",file.c_str());
+      _error->Warning(_("Can't find authentication record for: %s"), file.c_str());

       return false;
    }
 
    if (!Record->Hash.VerifyFile(prefix+file))
    {
       return false;
    }
 
    if (!Record->Hash.VerifyFile(prefix+file))
    {

-      _error->Warning("Hash mismatch for: %s",file.c_str());
+      _error->Warning(_("Hash mismatch for: %s"),file.c_str());

       return false;
    }
 
       return false;
    }
 


@@ -592,7 +592,10 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
       // a Release.gpg without a Release should never happen
       if(!FileExists(*I+"Release"))
 
       // a Release.gpg without a Release should never happen
       if(!FileExists(*I+"Release"))

+      {
+        delete MetaIndex;

         continue;
         continue;

+      }

 
 
       // verify the gpg signature of "Release"
 
 
       // verify the gpg signature of "Release"


@@ -844,7 +847,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)
       _error->Warning("No valid records were found.");
 
    if (NotFound + WrongSize > 10)

-      _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+      _error->Warning("A lot of entries were discarded, something may be wrong.\n");

    
 
    return true;
    
 
    return true;