summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-08-28 17:34:06 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-08-28 17:34:06 +0200
commit5edc3966e2e1eb4e94b5bd64d59c3a3a78a76ab0 (patch)
tree635fbe307ad7014fd888983fd2f6d401541a31e0
parent35db2f353975cba35597592f468d20d9aed8619c (diff)
* apt-pkg/contrib/fileutl.cc:
- apply SilentlyIgnore also on files without an extension
-rw-r--r--apt-pkg/contrib/fileutl.cc3
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 91aecee65..2b73d1424 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -309,7 +309,8 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl;
- _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str());
+ if (SilentIgnore.Match(Ent->d_name) == false)
+ _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str());
continue;
}
}
diff --git a/debian/changelog b/debian/changelog
index 1c12b56e3..781b0e6ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ apt (0.8.1) UNRELEASED; urgency=low
* apt-pkg/depcache.cc:
- now that apt-get purge works on 'rc' packages let the MarkDelete
pass this purge forward to the non-pseudo package for pseudos
+ * apt-pkg/contrib/fileutl.cc:
+ - apply SilentlyIgnore also on files without an extension
- -- David Kalnischkies <kalnischkies@gmail.com> Fri, 27 Aug 2010 12:02:15 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Sat, 28 Aug 2010 17:33:31 +0200
apt (0.8.0) unstable; urgency=low