summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-20 19:46:33 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-20 19:46:33 +0000
commit7fc87110566e5910ba7b597297f130c853e1dba6 (patch)
tree9100cb0d1b94e8b9de5106c945276573bdb787f5
parent77a9caaedcb3005a1e94fef7ea8618e42852a260 (diff)
downloadportage-7fc87110566e5910ba7b597297f130c853e1dba6.tar.gz
portage-7fc87110566e5910ba7b597297f130c853e1dba6.tar.bz2
portage-7fc87110566e5910ba7b597297f130c853e1dba6.zip
Bug #251591 - Adjust the InheritAutotools pattern to treat more things similar to
whitespace. Now it recognizes escaped newlines, || operators, and && operators. (trunk r12260) svn path=/main/branches/2.1.6/; revision=12263
-rw-r--r--pym/repoman/checks.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index c90b54f7b..6778c8c58 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -242,8 +242,8 @@ class InheritAutotools(LineCheck):
_autotools_funcs = (
"eaclocal", "eautoconf", "eautoheader",
"eautomake", "eautoreconf", "_elibtoolize")
- _autotools_func_re = re.compile(r'(^|\s)(' + \
- "|".join(_autotools_funcs) + ')(\s|$)')
+ _autotools_func_re = re.compile(r'(^|\s|\|\||&&)(' + \
+ "|".join(_autotools_funcs) + r')(\s|\|\||&&|\\?$)')
# Exempt eclasses:
# git - An EGIT_BOOTSTRAP variable may be used to call one of
# the autotools functions.