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

Add -MERGING-.* to vardbapi._excluded_dirs.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 34b8def7b..b7ce8b29b 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -233,7 +233,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')$')
 
 	def __init__(self, root, categories=None, settings=None, vartree=None):