summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-05 00:27:15 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-05 00:27:15 +0000
commitfa496b7c10c9c059af90fa9c16a1a5ba8e21db6f (patch)
tree3cba40c0b2a1524792a997fbf9b4a7280eaf4f06
parentOpen ld.so.conf as text (unicode). (diff)
downloadportage-multirepo-fa496b7c10c9c059af90fa9c16a1a5ba8e21db6f.tar.gz
portage-multirepo-fa496b7c10c9c059af90fa9c16a1a5ba8e21db6f.tar.bz2
portage-multirepo-fa496b7c10c9c059af90fa9c16a1a5ba8e21db6f.zip
Fix the FEATURES=parse-eapi-ebuild-head regex to handle comments on the same
line, like this: EAPI=2 #foo Thanks to Markus Meier <maekke@gentoo.org> for reporting. svn path=/main/trunk/; revision=13916
-rw-r--r--pym/portage/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ca276433..c17b0c6d 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5275,7 +5275,7 @@ def eapi_is_supported(eapi):
# the ebuild.
_validate_cache_for_unsupported_eapis = True
-_parse_eapi_ebuild_head_re = re.compile(r'^EAPI=[\'"]?([^\'"]*)')
+_parse_eapi_ebuild_head_re = re.compile(r'^EAPI=[\'"]?([^\'"#]*)')
_parse_eapi_ebuild_head_max_lines = 30
def _parse_eapi_ebuild_head(f):