diff options
| author | Michael Vogt <egon@bottom> | 2007-05-02 13:54:10 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2007-05-02 13:54:10 +0200 |
| commit | 8171c75b9939a13aa22a3f45d436a6305af561ff (patch) | |
| tree | 2bd4f97cb013b56642a845873f54d49f94b92e51 /apt-pkg/cdrom.cc | |
| parent | 3bc9f25de62f59cf5d4f90d1c1aaccc9ba23439b (diff) | |
| parent | 3036f1e491ec1c71fb8fe9ff35954cebb2574320 (diff) | |
* merged with the apt--mvo branch
Diffstat (limited to 'apt-pkg/cdrom.cc')
| -rw-r--r-- | apt-pkg/cdrom.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index b42c82dd0..aefe9c9e9 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -679,7 +679,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) if (List.size() == 0 && SourceList.size() == 0) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc"); } @@ -718,7 +719,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) { if(!log) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("No disc name found and no way to ask for it"); } @@ -796,7 +798,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } @@ -813,7 +816,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } |