summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-30 11:46:04 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-30 11:46:04 +0000
commit89349b0c1993b58bbf03bc7aad584d8f823698e0 (patch)
tree3375d2e663548e55cc2a3be89f54226df54af6df
parent53f45dd603af86f7d0fa4b9c9a1a1785460b352b (diff)
downloadportage-89349b0c1993b58bbf03bc7aad584d8f823698e0.tar.gz
portage-89349b0c1993b58bbf03bc7aad584d8f823698e0.tar.bz2
portage-89349b0c1993b58bbf03bc7aad584d8f823698e0.zip
Fix manifest2AuxfileFilter so that it correctly filters files such as 2.1_pre7/CVS/Entries.
svn path=/main/trunk/; revision=3042
-rw-r--r--pym/portage_manifest.py8
1 files changed, 7 insertions, 1 deletions
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)