* cmdline/apt-cdrom.cc:

  - make Acquire::cdrom::AutoDetect default, this can be
    turned off with "--no-auto-detect"

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 0c9aab28cb99915265ffec7a471625c099034ac7..8b9eacae67f0d8734b0e4802c3beb71f9e36f131 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -147,7 +147,7 @@ bool DoAdd(CommandLine &)
    pkgCdrom cdrom;
    bool res = true;
 
-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
    unsigned int count = 0;
    
    if (AutoDetect && UdevCdroms.Dlopen())

diff --git a/debian/changelog b/debian/changelog
index e6417c53c12fafcbfdcc7822fa8326a865e4d85a..a290d038998b432009bdd585167e3f58280f8673 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.25ubuntu4) lucid; urgency=low
+
+  * cmdline/apt-cdrom.cc:
+    - make Acquire::cdrom::AutoDetect default, this can be
+      turned off with "--no-auto-detect"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
+
 apt (0.7.25ubuntu3) lucid; urgency=low
 
   * cmdline/apt-get.cc: