diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 19:22:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 19:22:59 +0000 |
| commit | 5e837de9ce04f84598a664605e37f67b84969395 (patch) | |
| tree | ce63a331b25a18ef8c89866ef9e1aebcf774753d /pym | |
| parent | 61af83b0855f9ea2b5dc5f1a1342eef7faa4953b (diff) | |
| download | portage-5e837de9ce04f84598a664605e37f67b84969395.tar.gz portage-5e837de9ce04f84598a664605e37f67b84969395.tar.bz2 portage-5e837de9ce04f84598a664605e37f67b84969395.zip | |
Add -MERGING-.* to vardbapi._excluded_dirs. (trunk r10206)
svn path=/main/branches/2.1.2/; revision=10207
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
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')$') """ |