diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 20:03:54 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 20:03:54 +0000 |
| commit | f732cca1a45def35db5f88444b22c1485125bfde (patch) | |
| tree | 946a54b3fe80924bd74ed6b5b0fc34f2d250911b /apt-pkg/deb/debmetaindex.cc | |
| parent | 66aafd44ba32466ed2d30939ba7371ea6155e191 (diff) | |
| parent | 04f9a54dc9136f2d220a0180a750a9700a177de7 (diff) | |
* merged with mainline
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-105
Proofread by Fred Bothamy
* bubulle@debian.org--2005/apt--main--0--patch-106
Merge with mvo
* bubulle@debian.org--2005/apt--main--0--patch-107
Italian translation corrected
* bubulle@debian.org--2005/apt--main--0--patch-108
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-109
Italian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-110
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-111
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-112
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-113
Silly update to French translation (testing)
* bubulle@debian.org--2005/apt--main--0--patch-114
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-115
Basque translation completed
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
* leak fix for debian #250583
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
* 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/deb/debmetaindex.cc')
| -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 8dfbf7aff..ea53a847e 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -173,6 +173,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; |