summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/debmetaindex.cc2
-rw-r--r--debian/changelog2
-rw-r--r--doc/examples/configure-index2
3 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index ed5cb80d1..85e5b16b3 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -165,7 +165,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 0b4bd00e9..6b858cdcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,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