* apt-pkg/indexcopy.cc:

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

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index f88d51fc54d31efcdb380763fc9386bfe9e1b83a..064fb007c9decc7f9670b185d827a4886fc0ca5a 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -75,7 +75,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       
       // Open the package file
       FileFd Pkg;
       
       // Open the package file
       FileFd Pkg;

-      if (FileExists(*I + GetFileName()) == true)
+      if (RealFileExists(*I + GetFileName()) == true)

       {
         Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
         FileSize = Pkg.Size();
       {
         Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
         FileSize = Pkg.Size();


@@ -532,7 +532,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
    // we skip non-existing files in the verifcation to support a cdrom
    // with no Packages file (just a Package.gz), see LP: #255545
    // (non-existing files are not considered a error)
    // we skip non-existing files in the verifcation to support a cdrom
    // with no Packages file (just a Package.gz), see LP: #255545
    // (non-existing files are not considered a error)

-   if(!FileExists(prefix+file))
+   if(!RealFileExists(prefix+file))

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


@@ -601,7 +601,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       string const release = *I+"Release";
 
       // a Release.gpg without a Release should never happen
       string const release = *I+"Release";
 
       // a Release.gpg without a Release should never happen

-      if(FileExists(release) == false)
+      if(RealFileExists(release) == false)

       {
         delete MetaIndex;
         continue;
       {
         delete MetaIndex;
         continue;


@@ -681,7 +681,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
    std::vector<string> keyrings;
    if (DirectoryExists(trustedPath))
      keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
    std::vector<string> keyrings;
    if (DirectoryExists(trustedPath))
      keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);

-   if (FileExists(trustedFile) == true)
+   if (RealFileExists(trustedFile) == true)

      keyrings.push_back(trustedFile);
 
    std::vector<const char *> Args;
      keyrings.push_back(trustedFile);
 
    std::vector<const char *> Args;


@@ -722,7 +722,8 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
    }
 
    Args.push_back(FileGPG.c_str());
    }
 
    Args.push_back(FileGPG.c_str());

-   Args.push_back(File.c_str());
+   if (FileGPG != File)
+      Args.push_back(File.c_str());

    Args.push_back(NULL);
 
    if (Debug == true)
    Args.push_back(NULL);
 
    if (Debug == true)


@@ -787,7 +788,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       
       // Open the package file
       FileFd Pkg;
       
       // Open the package file
       FileFd Pkg;

-      if (FileExists(*I) == true)
+      if (RealFileExists(*I) == true)

       {
         Pkg.Open(*I,FileFd::ReadOnly);
         FileSize = Pkg.Size();
       {
         Pkg.Open(*I,FileFd::ReadOnly);
         FileSize = Pkg.Size();