Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 10cb29f662be05318858e671a382792d283d87bd..87a58e94887a7f008ce6e0dc439321f6f5780bd6 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -10,7 +10,6 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>


@@ -19,6 +18,8 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 

+#include "aptmethod.h"
+

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


@@ -29,7 +30,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-class CDROMMethod : public pkgAcqMethod
+class CDROMMethod : public aptMethod

 {
    bool DatabaseLoaded;
    bool Debug;
 {
    bool DatabaseLoaded;
    bool Debug;


@@ -42,9 +43,9 @@ class CDROMMethod : public pkgAcqMethod
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    bool AutoDetectAndMount(const URI, string &NewID);
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    bool AutoDetectAndMount(const URI, string &NewID);

-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;

    string GetID(string Name);
    string GetID(string Name);

-   virtual void Exit();
+   virtual void Exit() APT_OVERRIDE;

       
    public:
    
       
    public:
    


@@ -54,9 +55,9 @@ class CDROMMethod : public pkgAcqMethod
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly |

                                          SendConfig | NeedsCleanup |
                                          SendConfig | NeedsCleanup |

-                                         Removable), 
+                                         Removable),

                                           DatabaseLoaded(false),
                                          Debug(false),
                                           MountedByApt(false)
                                           DatabaseLoaded(false),
                                          Debug(false),
                                           MountedByApt(false)


@@ -176,7 +177,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
    URI Get = Itm->Uri;
    string File = Get.Path;
 
    URI Get = Itm->Uri;
    string File = Get.Path;

-   Debug = _config->FindB("Debug::Acquire::cdrom", false);
+   Debug = DebugEnabled();

 
    if (Debug)
       clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
 
    if (Debug)
       clog << "CDROMMethod::Fetch " << Itm->Uri << endl;


@@ -223,7 +224,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       return true;
    }
 
       return true;
    }
 

-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
+   bool const AutoDetect = ConfigFindB("AutoDetect", true);

    CDROM = _config->FindDir("Acquire::cdrom::mount");
    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;
    CDROM = _config->FindDir("Acquire::cdrom::mount");
    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;


@@ -260,7 +261,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));

-   
+
+   URIStart(Res);

    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;


@@ -278,8 +280,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   CDROMMethod Mth;
-   return Mth.Run();
+   _config->CndSet("Binary::cdrom::Debug::NoDropPrivs", true);
+   return CDROMMethod().Run();

 }
 }