summaryrefslogtreecommitdiff
path: root/methods/cdrom.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:00:02 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:00:02 +0000
commitf7dd079fa28e81d022cd3f502c493dbb1bf15eab (patch)
treec424b88b191f1915f236bfe33e746c5c8813ee9c /methods/cdrom.cc
parentc53766c774f15b1763101f845e27feec7ac3b176 (diff)
downloadapt-f7dd079fa28e81d022cd3f502c493dbb1bf15eab.tar.gz
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.
Diffstat (limited to 'methods/cdrom.cc')
-rw-r--r--methods/cdrom.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index a2045e729..c4fde2217 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
// -*- 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
@@ -137,6 +137,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
while (CurrentID.empty() == true)
{
bool Hit = false;
+ Mounted = MountCdrom(CDROM);
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;
}
-
- MountCdrom(CDROM);
- Mounted = true;
}
// Found a CD