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 0f8a393cd2f2b5c54d4934496c361f9042716979..8ef79150d77e326bf6bfb97c92635913cd83d66a 100644 (file)
--- 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')$')
 
        """