diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-16 23:09:42 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-16 23:09:42 +0100 |
| commit | e29a6bb14dcc004d174ad8502b76623139fbee06 (patch) | |
| tree | 246376ac5f6e5ce15c819086a5a13f27a20176eb /apt-pkg/policy.cc | |
| parent | daee881bf82d23197d991227fa0ab36b918b4323 (diff) | |
Fix the newly introduced method GetListOfFilesInDir to not accept every
file if no extension is enforced (= restore old behaviour). (Closes: #565213)
This commit includes also:
* 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
And a lovely test application of course.
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++) |