summaryrefslogtreecommitdiff
path: root/methods/cdrom.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:53:18 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:53:18 +0000
commit4df0b629aca0431f88248ce2e17702ff42367ca1 (patch)
treebaff3de8b6c26b9ea10bc7ed8da15632f7a63c21 /methods/cdrom.cc
parent6b1ff003a4acd2914dd395b651c485fb352e3d1a (diff)
CDROM patches from bluehorn
Author: jgg Date: 1999-03-28 01:37:26 GMT CDROM patches from bluehorn
Diffstat (limited to 'methods/cdrom.cc')
-rw-r--r--methods/cdrom.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 3049e5ba8..778cc63b1 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cdrom.cc,v 1.7 1998/12/22 08:20:55 jgg Exp $
+// $Id: cdrom.cc,v 1.8 1999/03/28 01:37:26 jgg Exp $
/* ######################################################################
CDROM URI method for APT
@@ -127,8 +127,11 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
// A hit
if (NewID == ID)
break;
-
- UnmountCdrom(CDROM);
+
+ // I suppose this should prompt somehow?
+ if (UnmountCdrom(CDROM) == false)
+ return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.",
+ CDROM.c_str());
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";