diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-31 15:20:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-31 15:20:28 +0000 |
| commit | 19ea72f4c885f121490ddce77c8528e01f850f4f (patch) | |
| tree | 2e93bc275a76814720321fc37ed76fa21d043056 /pym | |
| parent | 26f3f92f774e35bd08de4a07caf24b37c478cef7 (diff) | |
| download | portage-19ea72f4c885f121490ddce77c8528e01f850f4f.tar.gz portage-19ea72f4c885f121490ddce77c8528e01f850f4f.tar.bz2 portage-19ea72f4c885f121490ddce77c8528e01f850f4f.zip | |
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 <robbat2@gentoo.org> for reporting.
svn path=/main/trunk/; revision=13870
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
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:') |