merged from libudev-dlopen

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index fc949ce7b3155ce1e0ed2dd376faa7a87fa5f062..988a58f20eace57c57a7076345daaa68d8aa9882 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -99,7 +99,7 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
 };
                                                                        /*}}}*/
 // SetupAutoDetect                                                     /*{{{*/
 };
                                                                        /*}}}*/
 // SetupAutoDetect                                                     /*{{{*/

-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, int &i)
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)

 {
    bool Debug =  _config->FindB("Debug::Acquire::cdrom", false);
 
 {
    bool Debug =  _config->FindB("Debug::Acquire::cdrom", false);
 


@@ -120,9 +120,12 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, int &i)
       _config->Set("Acquire::cdrom::mount", v[i].MountPath);
       _config->Set("APT::CDROM::NoMount", true);
    } else {
       _config->Set("Acquire::cdrom::mount", v[i].MountPath);
       _config->Set("APT::CDROM::NoMount", true);
    } else {

-      MountCdrom("/var/lib/apt/media", v[i].DeviceName);
-      MountCdrom("/var/lib/apt/media", v[i].DeviceName);
-      _config->Set("Acquire::cdrom::mount", "/var/lib/apt/media");
+      string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+      if (!FileExists(AptMountPoint))
+        mkdir(AptMountPoint.c_str(), 0750);
+      if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
+        _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
+      _config->Set("Acquire::cdrom::mount", AptMountPoint);

       _config->Set("APT::CDROM::NoMount", true);
    }
    i++;
       _config->Set("APT::CDROM::NoMount", true);
    }
    i++;


@@ -142,10 +145,10 @@ bool DoAdd(CommandLine &)
    pkgUdevCdromDevices UdevCdroms;
    pkgCdromTextStatus log;
    pkgCdrom cdrom;
    pkgUdevCdromDevices UdevCdroms;
    pkgCdromTextStatus log;
    pkgCdrom cdrom;

-   bool res = false;
+   bool res = true;

 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");

-   int count = 0;
+   unsigned int count = 0;

    
    if (AutoDetect && UdevCdroms.Dlopen())
    {
    
    if (AutoDetect && UdevCdroms.Dlopen())
    {


@@ -173,7 +176,7 @@ bool DoIdent(CommandLine &)
    bool res = true;
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
    bool res = true;
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");

-   int count = 0;
+   unsigned int count = 0;

    
    if (AutoDetect && UdevCdroms.Dlopen())
    {
    
    if (AutoDetect && UdevCdroms.Dlopen())
    {