X-Git-Url: https://git.exim.org/buildfarm-client.git/blobdiff_plain/32d057cf275dde00e46491fd4eb5c43a7c936c5c..HEAD:/run_branches diff --git a/run_branches b/run_branches index 429b02e..18ee919 100755 --- a/run_branches +++ b/run_branches @@ -40,7 +40,7 @@ my %CALLED = ( argv => [@ARGV], # get a copy! ); chdir $RealBin or die "$0: Can't chdir to '$RealBin': $!\n"; -say "Changed working directory to '$RealBin'" if -t; +#say "Changed working directory to '$RealBin'" if -t; my %branch_last; my $run_build = './run_build'; @@ -79,15 +79,15 @@ require $buildconf; # Check if auto-update is wanted and possible eval { - if (not exists $EximBuild::Conf{auto_update} or $EximBuild::Conf{auto_update}) + if (not exists $EximBuild::conf{auto_update} or $EximBuild::conf{auto_update}) { - my $remote = $EximBuild::Conf{auto_update} // 'origin'; + my $remote = $EximBuild::conf{auto_update} // 'origin'; die "auto-update not possible: need write permissions in @{[cwd]}\n" if not -w '.'; # Get information about our remote and calculate the chance for a - # successfull auto-updat. Based on: + # successfull auto-update. Based on: # http://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git system("git fetch $remote") == 0 or die "'git fetch $remote' failed\n"; my ($upstream, $local, $base) = qx'git rev-parse ...@{upstream}' or die "'git rev-parse' failed\n"; @@ -140,8 +140,8 @@ elsif ($EximBuild::conf{branches_to_build} =~ /^(ALL|HEAD_PLUS_LATEST|HEAD_PLUS_LATEST2)$/ ) { - # Need to set the path here so we make sure we pick up the right perl. - # It has to be the perl that the build script would choose + # Need to set the path here so we make sure we pick up the right Perl. + # It has to be the Perl that the build script would choose # i.e. specially *not* the MinGW SDK perl that is invoked for the # build script, which means we need to put the path back the way it was # when we're done @@ -215,10 +215,10 @@ sub run_branch # Explicitly use perl from the path (and not this perl, so don't use $^X) # This script needs to run on Cygwin with non-cygwin perl if it's running # in tandem with AS/MinGW perl, since Cygwin perl doesn't honor locks - # the samne way, and the global lock fails. But the build script needs + # the same way, and the global lock fails. But the build script needs # to run with the native perl, even on Cygwin, which it picks up from # the path. (Head exploding yet?). - system("perl",@args); + system(perl => @args); } sub branch_last_sort