| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-05 00:27:15 +0000 (Wed, 05 Aug 2009) |
| 3 |
New Revision: 13916 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix the FEATURES=parse-eapi-ebuild-head regex to handle comments on the same |
| 9 |
line, like this: |
| 10 |
|
| 11 |
EAPI=2 #foo |
| 12 |
|
| 13 |
Thanks to Markus Meier <maekke@g.o> for reporting. |
| 14 |
|
| 15 |
|
| 16 |
Modified: main/trunk/pym/portage/__init__.py |
| 17 |
=================================================================== |
| 18 |
--- main/trunk/pym/portage/__init__.py 2009-08-05 00:17:15 UTC (rev 13915) |
| 19 |
+++ main/trunk/pym/portage/__init__.py 2009-08-05 00:27:15 UTC (rev 13916) |
| 20 |
@@ -5275,7 +5275,7 @@ |
| 21 |
# the ebuild. |
| 22 |
_validate_cache_for_unsupported_eapis = True |
| 23 |
|
| 24 |
-_parse_eapi_ebuild_head_re = re.compile(r'^EAPI=[\'"]?([^\'"]*)') |
| 25 |
+_parse_eapi_ebuild_head_re = re.compile(r'^EAPI=[\'"]?([^\'"#]*)') |
| 26 |
_parse_eapi_ebuild_head_max_lines = 30 |
| 27 |
|
| 28 |
def _parse_eapi_ebuild_head(f): |
Archives