methods/cdrom.cc: move the scan into the loop that waits for a CD

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 41eb8a0ee7be3a02263dd9dfff4c8d42f1637477..a677022adc1869ecf6a8b3b6a53e35b29b33645a 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -9,6 +9,7 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/acquire-method.h>
+#include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -17,6 +18,7 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <dlfcn.h>
 
 #include <iostream>
 #include <apti18n.h>
@@ -30,12 +32,13 @@ class CDROMMethod : public pkgAcqMethod
    ::Configuration Database;
    string CurrentID;
    string CDROM;
-   bool Mounted;
-   
+   bool MountedByApt;
+ 
+   bool IsCorrectCD(URI want, string MountPath);
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();
-   
+      
    public:
    
    CDROMMethod();
@@ -48,16 +51,18 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 
                                           DatabaseLoaded(false), 
-                                          Mounted(false)
+                                          MountedByApt(false)
 {
+
+
 };
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()
-{
-   if (Mounted == true)
+{ 
+  if (MountedByApt == true)
       UnmountCdrom(CDROM);
 }
                                                                        /*}}}*/
@@ -81,6 +86,31 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
                                                                        /*}}}*/
+
+// CDROMMethod::IsCorrectCD                                             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+{
+   bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   string NewID;
+
+   for (unsigned int Version = 2; Version != 0; Version--)
+   {
+      if (IdentCdrom(MountPath,NewID,Version) == false)
+        return false;
+      
+      if (Debug == true)
+        clog << "ID " << Version << " " << NewID << endl;
+      
+      // A hit
+      if (Database.Find("CD::" + NewID) == want.Host)
+        return true;
+   }
+   
+   return false;
+}
+                                                                       /*}}}*/
 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -91,6 +121,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    FetchResult Res;
 
    bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+   if (Debug)
+      clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
 
    /* All IMS queries are returned as a hit, CDROMs are readonly so 
       time stamps never change */
@@ -126,48 +158,79 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    }
 
    // We already have a CD inserted, but it is the wrong one
-   if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
+   if (CurrentID.empty() == false && 
+       CurrentID != "FAIL" &&
+       Database.Find("CD::" + CurrentID) != Get.Host)
    {
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }
-   
+
    CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   if (Debug)
+      clog << "Looking for CDROM at " << CDROM << endl;
+
    if (CDROM[0] == '.')
       CDROM= SafeGetCWD() + '/' + CDROM;
    string NewID;
+   pkgUdevCdromDevices udev;
+
    while (CurrentID.empty() == true)
    {
-      bool Hit = false;
-      Mounted = MountCdrom(CDROM);
-      for (unsigned int Version = 2; Version != 0; Version--)
+      // hrm, ugly the loop here
+      if (CDROM == "apt-udev-auto/") 
       {
-        if (IdentCdrom(CDROM,NewID,Version) == false)
-           return false;
-        
-        if (Debug == true)
-           clog << "ID " << Version << " " << NewID << endl;
-      
-        // A hit
-        if (Database.Find("CD::" + NewID) == Get.Host)
+        if(udev.Dlopen())
         {
-           Hit = true;
-           break;
-        }       
+           vector<struct CdromDevice> v = udev.Scan();
+           for (unsigned int i=0; i < v.size(); i++)
+           {
+              if (Debug)
+                 clog << "Have cdrom device " << v[i].DeviceName << endl;
+              if (!v[i].Mounted) 
+              {
+                 if (!FileExists("/media/apt"))
+                    mkdir("/media/apt", 0755);
+                 if(MountCdrom("/media/apt", v[i].DeviceName)) 
+                 {
+                    if (IsCorrectCD(Get, "/media/apt"))
+                    {
+                       MountedByApt = true;
+                       CDROM = "/media/apt";
+                       break;
+                    } else {
+                       UnmountCdrom("/media/apt");
+                    }
+                 }
+              } else {
+                 if (IsCorrectCD(Get, v[i].MountPath))
+                 {
+                    CDROM = v[i].MountPath;
+                    break;
+                 }
+              }
+           }
+        } else {
+           _error->WarningE("udev.Dlopen() failed","foo");
+        }
       }
 
-      if (Hit == true)
+      bool Hit = false;
+      if(!IsMounted(CDROM))
+        MountedByApt = MountCdrom(CDROM);
+      
+      if (IsCorrectCD(Get, CDROM))
         break;
         
       // I suppose this should prompt somehow?
-      if (UnmountCdrom(CDROM) == false)
+      if (_config->FindB("APT::CDROM::NoMount",false) == false &&
+         UnmountCdrom(CDROM) == false)
         return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."),
                              CDROM.c_str());
       if (MediaFail(Get.Host,CDROM) == false)
       {
         CurrentID = "FAIL";
-        Fail(_("Wrong CD-ROM"),true);
-        return true;
+        return _error->Error(_("Disk not found."));
       }
    }