[Libreoffice-commits] .: Branch 'tinderbox' - 2 commits - local_conf/Error_Parse.pm local_conf/TreeData.pm

[Christian Lohmaier]

 local_conf/Error_Parse.pm |    4 +++-
 local_conf/TreeData.pm    |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e7987729aecbd28e0083170152c877dd33dd744c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Jan 9 01:13:18 2011 +0100

    add MASTER tree for libreoffice use

diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index 566480b..e4b96c2 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -225,6 +225,12 @@ $VERSION = '#tinder_version#';
                    module => 'all',
                    branch => 'trunk',
                   },
+            'MASTER' =>  {
+                   root => 'git://anongit.freedesktop.org/git/libreoffice/bootstrap',
+                   module => 'all',
+                   branch => 'master',
+                   VCS  => 'GIT',
+                  },
            );
 
 # We group trees into sets so that individual managers can get a page
commit 5783778f4f110f7d5d70afe3f1ce6d582c11f5db
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Jan 9 01:12:26 2011 +0100

    minor refinement of boost-files

diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index 8ae1621..ee6e232 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -274,9 +274,11 @@ sub line_type {
 		     ($line =~ m#^\s*\[echo\]\s*Avalon-Framework not found: Cannot Build AvalonLogger#) ||
 		     # some more filenames that cause a false trigger
 		     ($line =~ m#^/bin/sh \.\./\.\./libtool --tag=CXX.*DynamicLibraryManagerException\.lo Exception\.lo#) ||
-		     ($line =~ m#^boost_1_39_0/(boost(/tr1/tr1(/sun)?)?|libs(/unordered/test)?)/exception/#) ||
+		     ($line =~ m#^boost_1_39_0/(boost(/tr1/tr1(/sun)?)?|libs(/unordered/test)?)/exception(\.|/)?#) ||
 		     ($line =~ m#^commons-lang-2\.3-src/src/(java|test)/org/apache/commons/lang/exception/#) ||
 		     ($line =~ m#^commons-httpclient-3\.1/docs/exception-handling\.html#) ||
+		     # annoying configure messages
+		     ($line =~ m#^checking (if|whether).*/bin/rm: cannot remove `conftest\*´: No such file or directory$#) ||
 		     
                      0);