fix the remaining lzma calls with xz --format=lzma in the testcases

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 026094a6eb7d7752c44e061a037f2ce3645dfbe4..50c2043716b274931c3a0614295f6aad8c81eca3 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -58,23 +58,21 @@ bool pkgCdrom::FindPackages(string CD,
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory

-   struct stat Buf;
-   if (stat(".disk",&Buf) == 0)
+   if (DirectoryExists(".disk") == true)

    {
       if (InfoDir.empty() == true)
         InfoDir = CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.
    {
       if (InfoDir.empty() == true)
         InfoDir = CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.

-   if (stat(".aptignr",&Buf) == 0)
+   if (RealFileExists(".aptignr") == true)

       return true;
 
       return true;
 

-

    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */
    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */

-   if (stat("Release.gpg",&Buf) == 0)
+   if (RealFileExists("Release.gpg") == true || RealFileExists("InRelease") == true)

    {
       SigList.push_back(CD);
    }
    {
       SigList.push_back(CD);
    }


@@ -86,7 +84,7 @@ bool pkgCdrom::FindPackages(string CD,
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {

-      if (stat(std::string("Packages").append(c->Extension).c_str(), &Buf) != 0)
+      if (RealFileExists(std::string("Packages").append(c->Extension).c_str()) == false)

         continue;
 
       if (_config->FindB("Debug::aptcdrom",false) == true)
         continue;
 
       if (_config->FindB("Debug::aptcdrom",false) == true)


@@ -101,7 +99,7 @@ bool pkgCdrom::FindPackages(string CD,
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {
    for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
        c != compressor.end(); ++c)
    {

-      if (stat(std::string("Sources").append(c->Extension).c_str(), &Buf) != 0)
+      if (RealFileExists(std::string("Sources").append(c->Extension).c_str()) == false)

         continue;
 
       if (_config->FindB("Debug::aptcdrom",false) == true)
         continue;
 
       if (_config->FindB("Debug::aptcdrom",false) == true)


@@ -279,6 +277,7 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
 /* Here we go and stat every file that we found and strip dup inodes. */
 bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {
 /* Here we go and stat every file that we found and strip dup inodes. */
 bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {

+   bool couldFindAllFiles = true;

    // Get a list of all the inodes
    ino_t *Inodes = new ino_t[List.size()];
    for (unsigned int I = 0; I != List.size(); ++I)
    // Get a list of all the inodes
    ino_t *Inodes = new ino_t[List.size()];
    for (unsigned int I = 0; I != List.size(); ++I)


@@ -299,21 +298,22 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
       }
 
       if (found == false)
       }
 
       if (found == false)

-         _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name);
+      {
+        _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name);
+        couldFindAllFiles = false;
+        Inodes[I] = 0;
+      }

    }
 
    }
 

-   if (_error->PendingError() == true) {
-      delete[] Inodes;
-      return false;
-   }
-   

    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    {
    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    {

+      if (Inodes[I] == 0)
+        continue;

       for (unsigned int J = I+1; J < List.size(); J++)
       {
         // No match
       for (unsigned int J = I+1; J < List.size(); J++)
       {
         // No match

-        if (Inodes[J] != Inodes[I])
+        if (Inodes[J] == 0 || Inodes[J] != Inodes[I])

            continue;
         
         // We score the two paths.. and erase one
            continue;
         
         // We score the two paths.. and erase one


@@ -339,7 +339,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
         List.erase(List.begin()+I);
    }
    
         List.erase(List.begin()+I);
    }
    

-   return true;
+   return couldFindAllFiles;

 }
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/
 }
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/


@@ -430,7 +430,8 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 
    Out.close();
    
 
    Out.close();
    

-   link(DFile.c_str(),string(DFile + '~').c_str());
+   if (FileExists(DFile) == true && link(DFile.c_str(),string(DFile + '~').c_str()) != 0)
+      return _error->Errno("link", "Failed to link %s to %s~", DFile.c_str(), DFile.c_str());

    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
                           DFile.c_str(),DFile.c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
                           DFile.c_str(),DFile.c_str());


@@ -697,7 +698,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       return false;
    }
 
       return false;
    }
 

-   chdir(StartDir.c_str());
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir","Unable to change to %s", StartDir.c_str());

 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {


@@ -718,7 +720,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                    /*{{{*/
    DropBinaryArch(List);
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
    DropBinaryArch(List);
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");

+   // FIXME: We ignore stat() errors here as we usually have only one of those in use
+   // This has little potencial to drop 'valid' stat() errors as we know that one of these
+   // files need to exist, but it would be better if we would check it here
+   _error->PushToStack();

    DropRepeats(SigList,"Release.gpg");
    DropRepeats(SigList,"Release.gpg");

+   DropRepeats(SigList,"InRelease");
+   _error->RevertToStack();

    DropRepeats(TransList,"");
    if(log != NULL) {
       msg.str("");
    DropRepeats(TransList,"");
    if(log != NULL) {
       msg.str("");