| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 19:22:59 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10207 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
Add -MERGING-.* to vardbapi._excluded_dirs. (trunk r10206) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/pym/portage.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/pym/portage.py 2008-05-05 19:22:42 UTC (rev 10206) |
| 14 |
+++ main/branches/2.1.2/pym/portage.py 2008-05-05 19:22:59 UTC (rev 10207) |
| 15 |
@@ -6520,7 +6520,7 @@ |
| 16 |
|
| 17 |
_excluded_dirs = ["CVS", "lost+found"] |
| 18 |
_excluded_dirs = [re.escape(x) for x in _excluded_dirs] |
| 19 |
- _excluded_dirs = re.compile(r'^(\..*|' + \ |
| 20 |
+ _excluded_dirs = re.compile(r'^(\..*|-MERGING-.*|' + \ |
| 21 |
"|".join(_excluded_dirs) + r')$') |
| 22 |
|
| 23 |
""" |
| 24 |
|
| 25 |
-- |
| 26 |
gentoo-commits@l.g.o mailing list |
Archives