Browse Source

* ftparchive/apt-ftparchive.cc:
- Read default configuration (Closes: #383257)

Julian Andres Klode 14 years ago
parent
commit
b34d4b4745
3 changed files with 10 additions and 1 deletions
  1. 7 0
      debian/NEWS
  2. 2 0
      debian/changelog
  3. 1 1
      ftparchive/apt-ftparchive.cc

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

+ 2 - 0
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.

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