From 19ea72f4c885f121490ddce77c8528e01f850f4f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 31 Jul 2009 15:20:28 +0000 Subject: In the _check_build_log(), exclude output from dev-libs/yaz-3.0.47 which looks like this: Configuration: Automake: ${SHELL} /var/tmp/portage/dev-libs/yaz-3.0.47/work/yaz-3.0.47/config/missing --run automake-1.10 Thanks to Robin H. Johnson for reporting. svn path=/main/trunk/; revision=13870 --- pym/portage/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0e279c433..4548ec3c2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5028,9 +5028,14 @@ def _check_build_log(mysettings, out=None): configure_opts_warn = [] configure_opts_warn_re = re.compile( r'^configure: WARNING: [Uu]nrecognized options: ') + + # Exclude output from dev-libs/yaz-3.0.47 which looks like this: + # + #Configuration: + # Automake: ${SHELL} /var/tmp/portage/dev-libs/yaz-3.0.47/work/yaz-3.0.47/config/missing --run automake-1.10 am_maintainer_mode_re = re.compile(r'/missing --run ') am_maintainer_mode_exclude_re = \ - re.compile(r'/missing --run (autoheader|makeinfo)') + re.compile(r'(/missing --run (autoheader|makeinfo)|^\s*Automake:\s)') make_jobserver_re = \ re.compile(r'g?make\[\d+\]: warning: jobserver unavailable:') -- cgit v1.2.3-1-g7c22