[Libreoffice-commits] .: 2 commits - solenv/bin

[Tor Lillqvist]

 solenv/bin/build.pl |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 4c40593e3e936e6a966410ab807df4b775fc2464
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Mar 21 12:40:42 2012 +0200

    $retry_counter and the RETRY label are now unused

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index f59d675..e5e009f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1814,7 +1814,6 @@ sub run_job {
     my ($job, $path, $registered_name) = @_;
     my $job_to_do = $job;
     my $error_code = 0;
-    my $retry_counter = 10;
 
     print "$registered_name\n";
     return 0 if ( $show );
@@ -1838,7 +1837,7 @@ sub run_job {
             system("$perl $mkout");
         };
     }
-RETRY:
+
     open (MAKE, "$job_to_do 2>&1 |") or return 8;
     open (LOGFILE, "> $log_file") or return 8;
     while (<MAKE>) { print LOGFILE $_; print $_ }
commit 5e553b1ee5d8266b14c1f553d310dd634ae3fb84
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Mar 21 12:27:08 2012 +0200

    GUI=WIN used to mean 16-bit Windows, I think, so kill that crack
    
    Also the running of grep inside the test for GUI = WIN was a bit weird,
    what was it supposed to grep? Standard input?

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 1b8ed64..f59d675 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1076,7 +1076,6 @@ sub pick_prj_to_build {
 sub check_platform {
     my $platform = shift;
     return 1 if ($platform eq 'all');
-    return 1 if (($ENV{GUI} eq 'WIN') && ($platform eq 'w'));
     return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u'));
     return 1 if (($ENV{GUI} eq 'WNT') &&
                  (($platform eq 'w') || ($platform eq 'n')));
@@ -1848,11 +1847,6 @@ RETRY:
     close LOGFILE;
     if ( $error_code != 0)
     {
-        if ($ENV{GUI} eq 'WIN' && $retry_counter > 0)
-        {
-            $retry_counter -= 1;
-            system('grep "Error 126\$"') && goto RETRY;
-        }
         system("echo \"log for $path\" >> $build_error_log");
         system("cat $log_file >> $build_error_log");
     }