From: Marius Mauch <genone@gentoo.org>
Date: Sun, 26 Mar 2006 03:08:11 +0000 (-0000)
Subject: fix AuxfileFilter to ignore all files in svn or cvs dirs
X-Git-Tag: v2.1_pre8~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58a215e83f8b15b1e34b316c66531724561b2416;p=portage.git

fix AuxfileFilter to ignore all files in svn or cvs dirs

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

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index a9f521ef0..5208cde7f 100644
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -9,7 +9,7 @@ class FileNotInManifestException(PortageException):
 
 def manifest2AuxfileFilter(filename):
 	filename = filename.strip(os.sep)
-	return not (filename in ["CVS", ".svn"] or filename.startswith("digest-"))
+	return not (filename in [".svn", "CVS"] or filename.startswith("CVS"+os.sep) or filename.startswith(".svn"+os.sep) or filename.startswith("digest-"))
 
 def manifest2MiscfileFilter(filename):
 	filename = filename.strip(os.sep)