* ftparchive/apt-ftparchive.cc:

  - Read default configuration (Closes: #383257)

diff --git a/debian/NEWS b/debian/NEWS
index a12f1a4f8882c833a1f3d38d8dd7aa5f4e6cb47a..775dc9458091f65f33fd691e118c770ef2c08ff3 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+apt (0.7.26~exp3) experimental; urgency=low
+
+  * apt-ftparchive now reads the standard configuration files in
+    /etc/apt/apt.conf and /etc/apt/apt.conf.d.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 26 Mar 2010 15:34:16 +0100
+
 apt (0.7.24) unstable; urgency=low
 
   * Already included in the last version but now with better documentation

diff --git a/debian/changelog b/debian/changelog
index fc5d0f90c9ec6087c5fa83de054608a4acdcd6ba..133d3874de1e9aa0c4e33699d3bc5dccfceda105 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
   * apt-pkg/policy.cc:
     - Always return a candidate if there is at least one version pinned > 0
       (Closes: #512318)
+  * ftparchive/apt-ftparchive.cc:
+    - Read default configuration (Closes: #383257)
   * debian/rules:
     - Fix the libraries name to be e.g. libapt-pkg4.9 instead of
       libapt-pkg-4.9.

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index f1a182e523451c43df0daaa3375f5e276d5af126..5456dd474cccd7d2a0ecfc4997e3fd0aa46cf089 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -925,7 +925,7 @@ int main(int argc, const char *argv[])
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
-   if (CmdL.Parse(argc,argv) == false)
+   if (pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false)
    {
       _error->DumpErrors();
       return 100;