diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-23 00:37:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-23 00:37:21 +0100 |
| commit | b39c18596d05cea1b3c0f0445b17080e9a2e4c19 (patch) | |
| tree | a9971b918364ff3e86fd9b7d10086e68e8e88151 /apt-pkg/policy.cc | |
| parent | 391149ba7f664924a5d2f1cfc5756896ca4ef3a1 (diff) | |
| download | apt-b39c18596d05cea1b3c0f0445b17080e9a2e4c19.tar.gz | |
* apt-pkg/contrib/fileutl.cc:
- Fix the newly introduced method GetListOfFilesInDir to not
accept every file if no extension is enforced
(= restore old behaviour). (Closes: #565213)
* apt-pkg/policy.cc:
- accept also partfiles with "pref" file extension as valid
* apt-pkg/contrib/configuration.cc:
- accept also partfiles with "conf" file extension as valid
* doc/apt.conf.5.xml:
- reorder description and split out syntax
- add partfile name convention (Closes: #558348)
* doc/apt_preferences.conf.5.xml:
- describe partfile name convention also here
* apt-pkg/deb/dpkgpm.cc:
- don't segfault if term.log file can't be opened.
Thanks Sam Brightman for the patch! (Closes: #475770)
* doc/*:
- replace the per language addendum with a global addendum
- add a explanation why translations include (maybe) english
parts to the new global addendum (Closes: #561636)
* apt-pkg/contrib/strutl.cc:
- fix malloc asseration fail with ja_JP.eucJP locale in
apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
Diffstat (limited to 'apt-pkg/policy.cc')
| -rw-r--r-- | apt-pkg/policy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 393181b6d..f9901bc9a 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -280,7 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir) return true; } - vector<string> const List = GetListOfFilesInDir(Dir, "", true); + vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true); // Read the files for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++) |