Explorar o código

* apt-pkg/contrib/fileutl.cc:
- do not warn about the ignoring of directories (Closes: #662762)

David Kalnischkies %!s(int64=14) %!d(string=hai) anos
pai
achega
84e254d6ae
Modificáronse 2 ficheiros con 10 adicións e 1 borrados
  1. 7 0
      apt-pkg/contrib/fileutl.cc
  2. 3 1
      debian/changelog

+ 7 - 0
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;

+ 3 - 1
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