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/contrib/fileutl.h | |
| 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/contrib/fileutl.h')
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 2807c29d9..85a94898c 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -82,8 +82,13 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +// FIXME: next ABI-Break: merge the two method-headers std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList); +std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList, bool const &AllowNoExt); +std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext, + bool const &SortList); string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); |