From: Julian Andres Klode <jak@debian.org>
Date: Mon, 6 Jul 2009 15:09:08 +0000 (+0200)
Subject: Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
X-Git-Tag: 0.7.22~23
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/13aa7588f24c4bc60c865071361d7be6e20c7086

Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
---

13aa7588f24c4bc60c865071361d7be6e20c7086
diff --cc debian/changelog
index 6ffd0459f,9024f687d..615a0efcb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -41,10 -41,9 +41,11 @@@ apt (0.7.22) UNRELEASED; urgency=lo
    * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
      ReadConfigFile.
    * Introduce support for the Enhances field. (Closes: #137583) 
 -  * Support /etc/apt/preferences.d (Closes: #535512)
++  * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
 +  * configure-index: document Dir::Etc::SourceParts and some other options
 +    (Closes: #459605)
  
-  -- Christian Perrier <bubulle@debian.org>  Wed, 22 Apr 2009 10:13:54 +0200
+  -- Julian Andres Klode <jak@debian.org>  Fri, 03 Jul 2009 08:27:35 +0200
  
  apt (0.7.21) unstable; urgency=low
  
diff --cc doc/examples/configure-index
index b2bc95e69,cea0dcc09..c2b1bb272
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -219,13 -219,10 +219,14 @@@ Dir "/
    
    // Config files
    Etc "etc/apt/" {
 -     SourceList "sources.list";
       Main "apt.conf";
 -     Preferences "preferences";     
       Parts "apt.conf.d/";
-      Preferences "preferences";     
++     Preferences "preferences";
++     PreferencesParts "preferences.d";
 +     SourceList "sources.list";
 +     SourceParts "sources.list.d";
 +     VendorList "vendors.list";
 +     VendorParts "vendors.list.d";
    };
    
    // Locations of binaries