summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-02-03 09:42:36 -0800
committerMichael Vogt <michael.vogt@ubuntu.com>2010-02-03 09:42:36 -0800
commit4df70e7528c21f948dfb7032271c499c53a21515 (patch)
tree0ff647793d1a2eeba4f857a127d02610b3fbd203
parent844b9d125c2a0c0d4c96d8801f11cb7b8b6b1583 (diff)
* cmdline/apt-cdrom.cc:
- make Acquire::cdrom::AutoDetect default, this can be turned off with "--no-auto-detect"
-rw-r--r--cmdline/apt-cdrom.cc2
-rw-r--r--debian/changelog8
2 files changed, 9 insertions, 1 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 0c9aab28c..8b9eacae6 100644
--- 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 e6417c53c..a290d0389 100644
--- 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: