diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-13 14:09:50 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-13 14:09:50 +0000 |
| commit | 2a7497704e9dee1f1d987e7a2cd59e939d991909 (patch) | |
| tree | 98087e3e9e8fa60a9a782bed102f57d34123faa9 /methods | |
| parent | cdadf54b3ab67aed6e9ecf902aabf4cc9896ef9e (diff) | |
| download | apt-2a7497704e9dee1f1d987e7a2cd59e939d991909.tar.gz | |
* merged from apt--cdrom-fallback--0
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
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.")); } } |