diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-06 10:53:35 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-06 10:53:35 +0100 |
| commit | 84e254d6aee034fec6ca10c4e5765d1280d0de0e (patch) | |
| tree | 915913ae27146efe1eb0df98db587b40d4f424bd /apt-pkg/contrib/fileutl.cc | |
| parent | 324cbd5693a3cf13224561aa14fc2057d8696469 (diff) | |
* apt-pkg/contrib/fileutl.cc:
- do not warn about the ignoring of directories (Closes: #662762)
Diffstat (limited to 'apt-pkg/contrib/fileutl.cc')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 557ba0ca6..1808489d7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -387,6 +387,13 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c { if (RealFileExists(File.c_str()) == false) { + // do not show ignoration warnings for directories + if ( +#ifdef _DIRENT_HAVE_D_TYPE + Ent->d_type == DT_DIR || +#endif + DirectoryExists(File.c_str()) == true) + continue; if (SilentIgnore.Match(Ent->d_name) == false) _error->Notice(_("Ignoring '%s' in directory '%s' as it is not a regular file"), Ent->d_name, Dir.c_str()); continue; |