From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Mar 2006 11:46:04 +0000 (-0000)
Subject: Fix manifest2AuxfileFilter so that it correctly filters files such as 2.1_pre7/CVS... 
X-Git-Tag: v2.1_pre8~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89349b0c1993b58bbf03bc7aad584d8f823698e0;p=portage.git

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

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

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index eb6758d60..e9f4a321f 100644
--- 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)