Преглед изворни кода

* apt-pkg/contrib/fileutl.cc:
- apply SilentlyIgnore also on files without an extension

David Kalnischkies пре 16 година
родитељ
комит
5edc3966e2
2 измењених фајлова са 5 додато и 2 уклоњено
  1. 2 1
      apt-pkg/contrib/fileutl.cc
  2. 3 1
      debian/changelog

+ 2 - 1
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;
 	    }
 	 }

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