From d83570f45104d67e7f7acb4549992245595a91c0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 5 May 2008 19:22:42 +0000 Subject: Add -MERGING-.* to vardbapi._excluded_dirs. svn path=/main/trunk/; revision=10206 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym') 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): -- cgit v1.2.3-1-g7c22