diff options
| author | Michael Vogt <mvo@debian.org> | 2005-10-20 09:44:54 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-10-20 09:44:54 +0000 |
| commit | d64805b9d9bb6df1ca22aff8ad040b5288c996eb (patch) | |
| tree | f9bc1791eddac116d922021c2999fe54dc9dda05 | |
| parent | 2cc1d69f0cde813351dc9d572a6cb3142bf7f579 (diff) | |
| parent | 4e0ad446347b1f3d70a66001365382db4d8e45f3 (diff) | |
* merged with main
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/examples/configure-index | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index ea53a847e..d3b6ed957 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -173,7 +173,7 @@ bool debReleaseIndex::IsTrusted() const string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; - if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(_config->FindB("APT::Authentication::TrustCDROM", false)) if(URI.substr(0,strlen("cdrom:")) == "cdrom:") return true; diff --git a/debian/changelog b/debian/changelog index ff400a6ab..2b100e040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.6.42.0exp1) experimental; urgency=low * added support for package index diffs * added support for i18n of the package descriptions + * synced with the apt--debian-sid--0 branch * build from mvo@debian.org--2005/apt--debian-experimental--0 (from http://people.debian.org/~mvo/arch) @@ -26,7 +27,7 @@ apt (0.6.42) unstable; urgency=low * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) * support for apt-get [build-dep|source] -t (closes: #152129) - * added "APT::Authentication::Trust-CDROM" option to make the life + * added "APT::Authentication::TrustCDROM" option to make the life for the installer people easier (closes: #334656) * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) (closes: #334671) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5ab84fe05..a93b74349 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -74,7 +74,7 @@ APT Authentication { - Trust-CDROM "false"; // consider the CDROM always trusted + TrustCDROM "false"; // consider the CDROM always trusted }; GPGV |