diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-13 20:11:06 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-13 20:11:06 +0000 |
| commit | db9df293ef7483f275e8aae2200767c8c6fdf9df (patch) | |
| tree | a14d137b6d186d585ecb12805c547c149b131563 /methods | |
| parent | 1e9331420fe8b6bed8aa88fb918f054eab7d2d3f (diff) | |
| parent | 2a7497704e9dee1f1d987e7a2cd59e939d991909 (diff) | |
* make it possible to fall back to other sources on fail in MediaChange events
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-110
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1
* initial patch to make falling back from cdrom possible
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2
* fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56
* merged from apt--cdrom-fallback--0
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/cdrom.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 41eb8a0ee..d6b8eae75 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -166,8 +166,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (MediaFail(Get.Host,CDROM) == false) { CurrentID = "FAIL"; - Fail(_("Wrong CD-ROM"),true); - return true; + return _error->Error(_("Disk not found.")); } } |