test: Substitute GNU commands for other commands where available

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 161822ac6e0062cb46b1ca99285c96132a6fe267..87a58e94887a7f008ce6e0dc439321f6f5780bd6 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -177,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;


@@ -224,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;