Check the currently mounted cdrom, to see if it's the o...

Author: doogie
Date: 2002-11-22 07:26:10 GMT
Check the currently mounted cdrom, to see if it's the one we are interested
in.

diff --git a/debian/changelog b/debian/changelog
index 7700878b607c5c74de6ae7620add030f0efdffda..94174bbc198fd823eebeb8dcb692e97dfefb3771 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,8 @@ apt (0.5.5) unstable; urgency=low
   * s/st_mtime/mtime/ on our local stat structure in apt-ftparchive, to
     support compliation on platforms where st_mtime is a macro.  Closes:
     #165518
   * s/st_mtime/mtime/ on our local stat structure in apt-ftparchive, to
     support compliation on platforms where st_mtime is a macro.  Closes:
     #165518

+  * Check the currently mounted cdrom, to see if it's the one we are
+    interested in.  Closes: #154602

 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600
 
 
  -- Jason Gunthorpe <jgg@debian.org>  Sun, 15 Sep 2002 17:16:59 -0600
 

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index a2045e729a5b79a1f22a9ebccf94ceb13257273b..c4fde2217f0c040d7c9dad6fbcd9bffb4829ff8c 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.18 2001/05/22 04:01:41 jgg Exp $
+// $Id: cdrom.cc,v 1.19 2002/11/22 07:26:10 doogie Exp $

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


@@ -137,6 +137,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    while (CurrentID.empty() == true)
    {
       bool Hit = false;
    while (CurrentID.empty() == true)
    {
       bool Hit = false;

+      Mounted = MountCdrom(CDROM);

       for (unsigned int Version = 2; Version != 0; Version--)
       {
         if (IdentCdrom(CDROM,NewID,Version) == false)
       for (unsigned int Version = 2; Version != 0; Version--)
       {
         if (IdentCdrom(CDROM,NewID,Version) == false)


@@ -166,9 +167,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
         Fail("Wrong CD",true);
         return true;
       }
         Fail("Wrong CD",true);
         return true;
       }

-      
-      MountCdrom(CDROM);
-      Mounted = true;

    }
    
    // Found a CD
    }
    
    // Found a CD