More or group patches

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index e46fc97be3e987605d0491958bce051f20721135..befd531a657e6529f9a5ac6275d7f2769f0808aa 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.12 1999/07/03 03:10:36 jgg Exp $
+// $Id: cdrom.cc,v 1.15 1999/10/02 04:14:54 jgg Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -20,8 +20,8 @@
 
 class CDROMMethod : public pkgAcqMethod
 {
 
 class CDROMMethod : public pkgAcqMethod
 {

-   Configuration Database;

    bool DatabaseLoaded;
    bool DatabaseLoaded;

+   ::Configuration Database;

    string CurrentID;
    
    virtual bool Fetch(FetchItem *Itm);
    string CurrentID;
    
    virtual bool Fetch(FetchItem *Itm);


@@ -77,6 +77,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;

+      Res.Filename = File;

       URIDone(Res);
       return true;
    }
       URIDone(Res);
       return true;
    }


@@ -142,7 +143,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
                              CDROM.c_str());
       if (MediaFail(Get.Host,CDROM) == false)
       {
                              CDROM.c_str());
       if (MediaFail(Get.Host,CDROM) == false)
       {

-        clog << "M-Fail" << endl;

         CurrentID = "FAIL";
         Fail("Wrong CD",true);
         return true;
         CurrentID = "FAIL";
         Fail("Wrong CD",true);
         return true;