Просмотр исходного кода

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

David Kalnischkies лет назад: 14
Родитель
Сommit
ab59c1ca30
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      apt-pkg/cdrom.cc
  2. 4 0
      debian/changelog

+ 1 - 1
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();
 

+ 4 - 0
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