diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 08:11:04 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 08:11:04 +0000 |
| commit | e8cdc56aaf6a12223fb9868784c18c8c0ada6315 (patch) | |
| tree | 86ee1b426082ca37aedee8a5750c2e25d50ceac6 /apt-pkg | |
| parent | aca056a93dda08ad03690b4b70295832a723a655 (diff) | |
* added APT::Authentication::Trust-CDROM option
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 526c8c0b2..ed5cb80d1 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -165,6 +165,10 @@ bool debReleaseIndex::IsTrusted() const string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; + if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(URI.substr(0,strlen("cdrom:")) == "cdrom:") + return true; + if (FileExists(VerifiedSigFile)) return true; return false; |