From: Heiko Schlittermann (HS12-RIPE) Date: Sun, 6 Nov 2016 22:32:32 +0000 (+0100) Subject: Fix check for global_lock_dir X-Git-Url: https://git.exim.org/buildfarm-client.git/commitdiff_plain/32d057cf275dde00e46491fd4eb5c43a7c936c5c?hp=9218d819b7570950ca7de64c8a482ffa376c0800 Fix check for global_lock_dir --- diff --git a/run_branches b/run_branches index 7506a52..429b02e 100755 --- a/run_branches +++ b/run_branches @@ -159,15 +159,12 @@ elsif ($EximBuild::conf{branches_to_build} =~ @branches = apply_throttle(@branches); -my $global_lock_dir = - $EximBuild::conf{global_lock_dir} - ||$EximBuild::conf{build_root} - ||''; +my $global_lock_dir = $EximBuild::conf{global_lock_dir} + // $EximBuild::conf{build_root} + // die "$0: need global_lock_dir\n"; -unless ($global_lock_dir && -d $global_lock_dir) -{ - die "no global lock directory: $global_lock_dir"; -} +die "$0: need r/w permissions for directory '$global_lock_dir'\n" + if not -d -w $global_lock_dir; # acquire the lock diff --git a/run_build b/run_build index 77c6de0..fe3ea92 100755 --- a/run_build +++ b/run_build @@ -173,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;