* 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)

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index c10ca6bd1e0e15c5e211c2b9300112a2c82fcb38..8462e82860cd721bbe280b82fd77d03103e9e991 100644 (file)
--- 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 44a6b6b906c4cd95c7f1b3caa85d6d2a975e3a10..9a135db015cf1db05f9d99cbcdd834a4a4ca8da5 100644 (file)
--- 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