summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-03-09 10:17:15 -0500
committerColin Walters <walters@verbum.org>2011-03-09 10:17:15 -0500
commit97dae7565587930d533011ab85f43c5bf2041bb6 (patch)
treeb72f18dd5b1473506a57087e5758b51edbf21902
parentc285d395e7b3fc66a9cf16a0a4ce9d5eb3afbc97 (diff)
downloadhomegit-MOVED-TO-GNOME-97dae7565587930d533011ab85f43c5bf2041bb6.zip
homegit-MOVED-TO-GNOME-97dae7565587930d533011ab85f43c5bf2041bb6.tar.gz
homegit-MOVED-TO-GNOME-97dae7565587930d533011ab85f43c5bf2041bb6.tar.xz
metabuild: Whitelist our own output
-rwxr-xr-xbin/metabuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/metabuild b/bin/metabuild
index 4af678d..61bbb32 100755
--- a/bin/metabuild
+++ b/bin/metabuild
@@ -50,7 +50,7 @@ if os.uname()[0] == 'Linux':
output_print_timeout_mseconds = 5000
warning_re = re.compile(': (warning)|(error)|(fatal error): ')
-output_whitelist_re = re.compile(r'^make(\[[0-9]+\])?: Entering directory')
+output_whitelist_re = re.compile(r'^(make(\[[0-9]+\])?: Entering directory)|(metabuild: )')
default_make_parallel = ['-j', '%d' % (cpu_count() * 6, )]
configargs = ['--prefix=' + root, '--libdir=' + libdir]
makeargs = ['make']