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 | |
| parent | 324cbd5693a3cf13224561aa14fc2057d8696469 (diff) | |
| download | apt-84e254d6aee034fec6ca10c4e5765d1280d0de0e.tar.gz | |
* apt-pkg/contrib/fileutl.cc:
- do not warn about the ignoring of directories (Closes: #662762)
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 557ba0ca..1808489d 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; diff --git a/debian/changelog b/debian/changelog index 26033fe4..1569098c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low * apt-pkg/packagemanager.cc: - do not try to a void a breaks if the broken package pre-depends on the breaker, but let dpkg auto-deconfigure it + * apt-pkg/contrib/fileutl.cc: + - do not warn about the ignoring of directories (Closes: #662762) [ Steve Langasek ] * cmdline/apt-get.cc: @@ -72,7 +74,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.h: - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 04 Mar 2012 22:59:55 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Tue, 06 Mar 2012 10:52:00 +0100 apt (0.8.16~exp12) experimental; urgency=low |