Fix manifest2AuxfileFilter so that it correctly filters files such as 2.1_pre7/CVS...

svn path=/main/trunk/; revision=3042

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index eb6758d609cc6b063b434c2f3cfb803b99647102..e9f4a321f041419e7684251213cd53af3eb6e446 100644 (file)
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -10,7 +10,13 @@ class FileNotInManifestException(PortageException):
 
 def manifest2AuxfileFilter(filename):
        filename = filename.strip(os.sep)
-       return not (filename in [".svn", "CVS"] or filename.startswith("CVS"+os.sep) or filename.startswith(".svn"+os.sep) or filename.startswith("digest-"))
+       for ignored_dir in ("CVS", ".bzr",".git",".svn"):
+               if filename == ignored_dir or \
+                       filename.startswith(ignored_dir+os.sep) or \
+                       filename.endswith(os.sep+ignored_dir) or \
+                       filename.find(os.sep+ignored_dir+os.sep)!=-1:
+                       return False
+       return not filename.startswith("digest-")
 
 def manifest2MiscfileFilter(filename):
        filename = filename.strip(os.sep)