From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 19:22:59 +0000 (-0000)
Subject: Add -MERGING-.* to vardbapi._excluded_dirs. (trunk r10206)
X-Git-Tag: v2.1.5~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e837de9ce04f84598a664605e37f67b84969395;p=portage.git

Add -MERGING-.* to vardbapi._excluded_dirs. (trunk r10206)

svn path=/main/branches/2.1.2/; revision=10207
---

diff --git a/pym/portage.py b/pym/portage.py
index 0f8a393cd..8ef79150d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6520,7 +6520,7 @@ class vardbapi(dbapi):
 
 	_excluded_dirs = ["CVS", "lost+found"]
 	_excluded_dirs = [re.escape(x) for x in _excluded_dirs]
-	_excluded_dirs = re.compile(r'^(\..*|' + \
+	_excluded_dirs = re.compile(r'^(\..*|-MERGING-.*|' + \
 		"|".join(_excluded_dirs) + r')$')
 
 	"""