diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 19:22:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 19:22:42 +0000 |
| commit | d83570f45104d67e7f7acb4549992245595a91c0 (patch) | |
| tree | 851be43cb591a18aeb7374dafe05956fc940fac1 /pym/portage | |
| parent | cc00dc9e2e5a0369580c87a6da72f71e863cdb02 (diff) | |
| download | portage-d83570f45104d67e7f7acb4549992245595a91c0.tar.gz portage-d83570f45104d67e7f7acb4549992245595a91c0.tar.bz2 portage-d83570f45104d67e7f7acb4549992245595a91c0.zip | |
Add -MERGING-.* to vardbapi._excluded_dirs.
svn path=/main/trunk/; revision=10206
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |