Fix check for global_lock_dir

[buildfarm-client.git] / run_build

diff --git a/run_build b/run_build
index 2bd6c52141c8f179ab018b24c41a3e569191d1b7..fe3ea9294d4af1579228297f9c3e9b44bf74b369 100755 (executable)
--- a/run_build
+++ b/run_build
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 =comment
 
@@ -32,7 +32,7 @@ See accompanying License file for license details
 
 ###################################################
 
-use vars qw($VERSION); $VERSION = 'REL_0.1';
+our $VERSION = 'REL_0.1';
 
 use strict;
 use warnings;
@@ -83,11 +83,15 @@ if ($0 =~ /(.*)\.pl$/) {
     exec $1, @ARGV;
 }
 
+die "$0: please use an umask of 022\n"
+    if umask > 022;
 
 my %module_hooks;
 my $orig_dir = getcwd();
 push @INC, $orig_dir;
 
+umask 022;
+
 # make sure we exit nicely on any normal interrupt
 # so the cleanup handler gets called.
 # that lets us stop the db if it's running and
@@ -153,6 +157,15 @@ print_help() if ($help);
 # process config file
 #
 require $buildconf;
+#use Data::Dumper;
+#die Dumper \%EximBuild::conf;
+
+
+# Does not seem to be necessary
+#die "$0: permissions on '$EximBuild::conf{build_root}' should be >= 0775\n"
+#    if -d $EximBuild::conf{build_root}
+#      and ((stat $EximBuild::conf{build_root})[2] & 0775) != 0775;
+
 
 # get the config data into some local variables
 my (
@@ -160,14 +173,22 @@ my (
     $aux_path,$trigger_exclude,$trigger_include,$secret,
     $keep_errs,$force_every, $make, $optional_steps,
     $use_vpath,$tar_log_cmd, $using_msvc, $extra_config,
-    $make_jobs, $core_file_glob
+    $make_jobs, $core_file_glob, $global_lock_dir
   )
   =@EximBuild::conf{
     qw(build_root target animal print_success aux_path trigger_exclude
       trigger_include secret keep_error_builds force_every make optional_steps
-      use_vpath tar_log_cmd using_msvc extra_config make_jobs core_file_glob)
+      use_vpath tar_log_cmd using_msvc extra_config make_jobs core_file_glob global_lock_dir)
   };
 
+# This should be done more generally, for all the scripts
+# including the $buildconf. For now this is duplicated
+# in a similiar war in run_branches.
+$global_lock_dir //= $buildroot // die "$0: need global_lock_dir\n";
+
+die "$0: need read/write permissions on '$global_lock_dir': $!\n"
+    if not -r -w $global_lock_dir;
+
 #default is no parallel build
 $make_jobs ||= 1;
 
@@ -1431,7 +1452,7 @@ sub get_script_config_dump
     delete $conf->{secret};
 
     if ($conf->{scm} eq 'git') {
-        chomp($conf->{farm}{revision} = `git describe --tags --always --dirty=+`);
+        chomp($conf->{farm}{revision} = `git -C $Bin describe --tags --always --dirty=+`);
        $conf->{farm}{cwd} = getcwd();
        $conf->{farm}{bindir} = $Bin;
     }