[Libreoffice-commits] .: solenv/bin

[Caolán McNamara]

 solenv/bin/build.pl |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit b8e3ce8c4fb8f1d4b898add1b3d86f2340df23ba
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 14 11:04:56 2010 +0000

    try and rebuild dependencies on first dmake failure

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 43c0188..a5f4fb9 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -783,6 +783,18 @@ sub dmake_dir {
         remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
         return if ($cmd_file || $show);
         $error_code = run_job($dmake, $job_name);
+
+        #if dmake fails, have a go at regenerating the dependencies
+        #and try again
+        if ($error_code && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
+            print "Forcing regeneration of dependency info\n";
+            $ENV{depend} = 't';
+            run_job($dmake, $job_name);
+            print "Retrying $job_name\n";
+            $ENV{depend} = '';
+            $error_code = run_job($dmake, $job_name);
+        }
+
         html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
     if ($error_code && $ignore) {