summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/cdrom.cc2
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index c10ca6bd1..8462e8286 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -409,7 +409,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
/* Write out all of the configuration directives by walking the
configuration tree */
- _config->Dump(Out, NULL, "%f \"%v\";\n", false);
+ Cnf.Dump(Out, NULL, "%f \"%v\";\n", false);
Out.close();
diff --git a/debian/changelog b/debian/changelog
index 44a6b6b90..9a135db01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
apt (0.9.5.2) UNRELEASED; urgency=low
[ David Kalnischkies ]
+ * apt-pkg/cdrom.cc:
+ - fix regression from 0.9.3 which dumped the main configuration
+ _config instead of the cdrom settings (Cnf) as identified and
+ tested by Milan Kupcevic, thanks! (Closes: #674100)
* cmdline/apt-get.cc:
- do not show 'list of broken packages' header if no package
is broken as it happens e.g. for external resolver errors