* apt-pkg/cdrom.cc:

  - use Dump() to generate the configuration output

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 50c2043716b274931c3a0614295f6aad8c81eca3..c10ca6bd1e0e15c5e211c2b9300112a2c82fcb38 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -409,27 +409,10 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
    
    /* Write out all of the configuration directives by walking the
       configuration tree */
-   const Configuration::Item *Top = Cnf.Tree(0);
-   for (; Top != 0;)
-   {
-      // Print the config entry
-      if (Top->Value.empty() == false)
-        Out <<  Top->FullTag() + " \"" << Top->Value << "\";" << endl;
-      
-      if (Top->Child != 0)
-      {
-        Top = Top->Child;
-        continue;
-      }
-      
-      while (Top != 0 && Top->Next == 0)
-        Top = Top->Parent;
-      if (Top != 0)
-        Top = Top->Next;
-   }   
+   _config->Dump(Out, NULL, "%f \"%v\";\n", false);
 
    Out.close();
-   
+
    if (FileExists(DFile) == true && link(DFile.c_str(),string(DFile + '~').c_str()) != 0)
       return _error->Errno("link", "Failed to link %s to %s~", DFile.c_str(), DFile.c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)

diff --git a/debian/changelog b/debian/changelog
index 97a7855fb3ef65dd3adfc2b74e0fae88efa69ed8..145da311e05589b8181b059ba7e8f509d54f3d8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ apt (0.9.3) unstable; urgency=low
   * cmdline/apt-config.cc:
     - make it possible to limit dump to a subtree
     - implement --empty and --format option for dump
+  * apt-pkg/cdrom.cc:
+    - use Dump() to generate the configuration output
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 22 Apr 2012 12:29:07 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 22 Apr 2012 13:01:04 +0200
 
 apt (0.9.2) unstable; urgency=low