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