diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:18 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:18 +0000 |
| commit | 33abc0e5956f24613e4851e024f33c78426eaba0 (patch) | |
| tree | b4bf846b7824d360dbc98170f085ab5197dfd43a /methods/cdrom.cc | |
| parent | f631d1baacfd7eb0b0c2c98e971da24d57129fcb (diff) | |
Fixes
Author: jgg
Date: 1998-12-22 07:41:25 GMT
Fixes
Diffstat (limited to 'methods/cdrom.cc')
| -rw-r--r-- | methods/cdrom.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index e114371d1..0187283c1 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdrom.cc,v 1.4 1998/12/22 07:36:49 jgg Exp $ +// $Id: cdrom.cc,v 1.5 1998/12/22 07:41:25 jgg Exp $ /* ###################################################################### CDROM URI method for APT @@ -57,6 +57,7 @@ string CDROMMethod::GetID(string Name) _error->Error("Unable to read the cdrom database %s", DFile.c_str()); Fail(); + return string(); } } DatabaseLoaded = true; @@ -100,14 +101,14 @@ bool CDROMMethod::Fetch(FetchItem *Itm) { Fail("Please use apt-cdrom to make this CD recognized by APT." " apt-get update cannot be used to add new CDs"); - return true; + return false; } // We already have a CD inserted, but it is the wrong one if (CurrentID.empty() == false && ID != CurrentID) { Fail("Wrong CD",true); - return true; + return false; } string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); @@ -128,7 +129,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) { CurrentID = "FAIL"; Fail("Wrong CD",true); - return true; + return false; } MountCdrom(CDROM); |