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 34b8def7b9502bed5274677dc7545e2aba02bb7b..b7ce8b29beb7c895ad4b6277b7d46fafc4cdfcff 100644 (file)
--- 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):