fix test/integration/test-apt-ftparchive-cachedb-lp1274466 in travis

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 838c8887a16eac6c7291f8536920b4ac22e13a8e..a5ad6a9ff130225d3fffd2caeb5f8405a96046a2 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,28 +1,30 @@
 /*
  */
 /*
  */

-#include<config.h>
-
-#include<apt-pkg/init.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/cdromutl.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/cdrom.h>
-#include<apt-pkg/aptconfiguration.h>
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/fileutl.h>
-
-#include<sstream>
-#include<fstream>
+#include <config.h>
+
+#include <apt-pkg/error.h>
+#include <apt-pkg/cdromutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexcopy.h>
+
+
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <sstream>
+#include <fstream>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <fcntl.h>

 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
 #include <dlfcn.h>
 
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <algorithm>
 #include <dlfcn.h>
 

-#include "indexcopy.h"
-

 #include<apti18n.h>
 
 using namespace std;
 #include<apti18n.h>
 
 using namespace std;


@@ -369,7 +371,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 // ---------------------------------------------------------------------
 /* This takes the list of source list expressed entires and collects
    similar ones to form a single entry for each dist */
 // ---------------------------------------------------------------------
 /* This takes the list of source list expressed entires and collects
    similar ones to form a single entry for each dist */

-void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
+void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)

 {
    sort(List.begin(),List.end());
    
 {
    sort(List.begin(),List.end());
    


@@ -440,7 +442,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
    Out.close();
 
    if (FileExists(DFile) == true)
    Out.close();
 
    if (FileExists(DFile) == true)

-      rename(DFile.c_str(), string(DFile + '~').c_str());
+      rename(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());


@@ -553,7 +555,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    
    Out.close();
 
    
    Out.close();
 

-   rename(File.c_str(),string(File + '~').c_str());
+   rename(File.c_str(), (File + '~').c_str());

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


@@ -561,7 +563,16 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/
+bool pkgCdrom::UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log)/*{{{*/
+{
+   if (_config->FindB("APT::CDROM::NoMount",false) == true)
+      return true;
+   if (log != NULL)
+      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+   return UnmountCdrom(CDROM);
+}
+                                                                       /*}}}*/
+bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log, bool const interactive)/*{{{*/

 {
    // Startup
    CDROM = _config->FindDir("Acquire::cdrom::mount");
 {
    // Startup
    CDROM = _config->FindDir("Acquire::cdrom::mount");


@@ -579,16 +590,17 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
    // Unmount the CD and get the user to put in the one they want
    if (_config->FindB("APT::CDROM::NoMount", false) == false)
    {
    // Unmount the CD and get the user to put in the one they want
    if (_config->FindB("APT::CDROM::NoMount", false) == false)
    {

-      if(log != NULL)
-        log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
-      UnmountCdrom(CDROM);
-
-      if(log != NULL)
+      if (interactive == true)

       {
       {

-        log->Update(_("Waiting for disc...\n"), STEP_WAIT);
-        if(!log->ChangeCdrom()) {
-           // user aborted
-           return false;
+        UnmountCDROM(CDROM, log);
+
+        if(log != NULL)
+        {
+           log->Update(_("Waiting for disc...\n"), STEP_WAIT);
+           if(!log->ChangeCdrom()) {
+              // user aborted
+              return false;
+           }

         }
       }
 
         }
       }
 


@@ -600,15 +612,19 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
         return _error->Error("Failed to mount the cdrom.");
    }
 
         return _error->Error("Failed to mount the cdrom.");
    }
 

+   if (IsMounted(CDROM) == false)
+      return _error->Error("Failed to mount the cdrom.");
+

    // Hash the CD to get an ID
    if (log != NULL)
    // Hash the CD to get an ID
    if (log != NULL)

-      log->Update(_("Identifying.. "), STEP_IDENT);
+      log->Update(_("Identifying... "), STEP_IDENT);

 
    if (IdentCdrom(CDROM,ident) == false)
    {
       ident = "";
       if (log != NULL)
         log->Update("\n");
 
    if (IdentCdrom(CDROM,ident) == false)
    {
       ident = "";
       if (log != NULL)
         log->Update("\n");

+      UnmountCDROM(CDROM, NULL);

       return false;
    }
 
       return false;
    }
 


@@ -624,8 +640,11 @@ bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, s
    if (FileExists(DFile) == true)
    {
       if (ReadConfigFile(Database,DFile) == false)
    if (FileExists(DFile) == true)
    {
       if (ReadConfigFile(Database,DFile) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());

+      }

    }
    return true;
 }
    }
    return true;
 }


@@ -634,7 +653,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)            /*{{{*/
 {
    Configuration Database;
    std::string CDROM;
 {
    Configuration Database;
    std::string CDROM;

-   if (MountAndIdentCDROM(Database, CDROM, ident, log) == false)
+   if (MountAndIdentCDROM(Database, CDROM, ident, log, false) == false)

       return false;
 
    if (log != NULL)
       return false;
 
    if (log != NULL)


@@ -646,13 +665,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)           /*{{{*/
    }
 
    // Unmount and finish
    }
 
    // Unmount and finish

-   if (_config->FindB("APT::CDROM::NoMount",false) == false)
-   {
-      if (log != NULL)
-        log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
-      UnmountCdrom(CDROM);
-   }
-
+   UnmountCDROM(CDROM, log);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -660,11 +673,11 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
 {
    Configuration Database;
    std::string ID, CDROM;
 {
    Configuration Database;
    std::string ID, CDROM;

-   if (MountAndIdentCDROM(Database, CDROM, ID, log) == false)
+   if (MountAndIdentCDROM(Database, CDROM, ID, log, true) == false)

       return false;
 
    if(log != NULL)
       return false;
 
    if(log != NULL)

-      log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);
+      log->Update(_("Scanning disc for index files...\n"),STEP_SCAN);

 
    // Get the CD structure
    vector<string> List;
 
    // Get the CD structure
    vector<string> List;


@@ -677,11 +690,15 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    {
       if (log != NULL)
         log->Update("\n");
    {
       if (log != NULL)
         log->Update("\n");

+      UnmountCDROM(CDROM, NULL);

       return false;
    }
 
    if (chdir(StartDir.c_str()) != 0)
       return false;
    }
 
    if (chdir(StartDir.c_str()) != 0)

+   {
+      UnmountCDROM(CDROM, NULL);

       return _error->Errno("chdir","Unable to change to %s", StartDir.c_str());
       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)
    {


@@ -723,8 +740,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
 
    if (List.empty() == true && SourceList.empty() == true) 
    {
 
    if (List.empty() == true && SourceList.empty() == true) 
    {

-      if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-        UnmountCdrom(CDROM);
+      UnmountCDROM(CDROM, NULL);

       return _error->Error(_("Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?"));
    }
 
       return _error->Error(_("Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?"));
    }
 


@@ -737,7 +753,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       if (InfoDir.empty() == false &&
          FileExists(InfoDir + "/info") == true)
       {
       if (InfoDir.empty() == false &&
          FileExists(InfoDir + "/info") == true)
       {

-        ifstream F(string(InfoDir + "/info").c_str());
+        ifstream F((InfoDir + "/info").c_str());

         if (!F == 0)
            getline(F,Name);
 
         if (!F == 0)
            getline(F,Name);
 


@@ -764,14 +780,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
       {
         if(log == NULL) 
          {
       {
         if(log == NULL) 
          {

-           if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-              UnmountCdrom(CDROM);
+           UnmountCDROM(CDROM, NULL);

            return _error->Error("No disc name found and no way to ask for it");
         }
 
         while(true) {
            if(!log->AskCdromName(Name)) {
               // user canceld
            return _error->Error("No disc name found and no way to ask for it");
         }
 
         while(true) {
            if(!log->AskCdromName(Name)) {
               // user canceld

+              UnmountCDROM(CDROM, NULL);

               return false; 
            }
            cout << "Name: '" << Name << "'" << endl;
               return false; 
            }
            cout << "Name: '" << Name << "'" << endl;


@@ -808,7 +824,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                    /*{{{*/
    string const partialListDir = listDir + "partial/";
    if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
        CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)
    string const partialListDir = listDir + "partial/";
    if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
        CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)

+   {
+      UnmountCDROM(CDROM, NULL);

       return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());
       return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());

+   }

 
    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")
 
    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")


@@ -822,7 +841,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                    /*{{{*/
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
    if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)

+   {
+      UnmountCDROM(CDROM, NULL);

       return false;
       return false;

+   }

 
    // reduce the List so that it takes less space in sources.list
    ReduceSourcelist(CDROM,List);
 
    // reduce the List so that it takes less space in sources.list
    ReduceSourcelist(CDROM,List);


@@ -832,13 +854,19 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                   /*{{{*/
    if (_config->FindB("APT::cdrom::NoAct",false) == false)
    {
       if (WriteDatabase(Database) == false)
    if (_config->FindB("APT::cdrom::NoAct",false) == false)
    {
       if (WriteDatabase(Database) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         return false;
         return false;

-      
+      }
+

       if(log != NULL)
         log->Update(_("Writing new source list\n"), STEP_WRITE);
       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)
       if(log != NULL)
         log->Update(_("Writing new source list\n"), STEP_WRITE);
       if (WriteSourceList(Name,List,false) == false ||
          WriteSourceList(Name,SourceList,true) == false)

+      {
+        UnmountCDROM(CDROM, NULL);

         return false;
         return false;

+      }

    }
 
    // Print the sourcelist entries
    }
 
    // Print the sourcelist entries


@@ -850,8 +878,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {

-        if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-           UnmountCdrom(CDROM);
+        UnmountCDROM(CDROM, NULL);

         return _error->Error("Internal error");
       }
 
         return _error->Error("Internal error");
       }
 


@@ -869,8 +896,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                     /*{{{*/
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
       {

-        if (_config->FindB("APT::CDROM::NoMount",false) == false) 
-           UnmountCdrom(CDROM);
+        UnmountCDROM(CDROM, NULL);

         return _error->Error("Internal error");
       }
 
         return _error->Error("Internal error");
       }
 


@@ -883,12 +909,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)                                    /*{{{*/
    }
 
    // Unmount and finish
    }
 
    // Unmount and finish

-   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
-      if (log != NULL)
-        log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
-      UnmountCdrom(CDROM);
-   }
-
+   UnmountCDROM(CDROM, log);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -981,7 +1002,7 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
       cdrom.DeviceName = string(devnode);
       if (mountpath != "") {
         cdrom.MountPath = mountpath;
       cdrom.DeviceName = string(devnode);
       if (mountpath != "") {
         cdrom.MountPath = mountpath;

-        string s = string(mountpath);
+        string s = mountpath;

         cdrom.Mounted = IsMounted(s);
       } else {
         cdrom.Mounted = false;
         cdrom.Mounted = IsMounted(s);
       } else {
         cdrom.Mounted = false;