Skip to content

Commit

Permalink
export snapshot time, fix log name, do not try to run PL checks if no…
Browse files Browse the repository at this point in the history
… PLs configured.
  • Loading branch information
adunstan committed Jan 25, 2014
1 parent ddcf12d commit 61ace80
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions run_build.pl
Expand Up @@ -183,7 +183,7 @@ BEGIN
my $config_opts = $PGBuild::conf{config_opts};
my $scm = new PGBuild::SCM \%PGBuild::conf;

my $buildport;
use vars qw($buildport);

if (exists $PGBuild::conf{base_port})
{
Expand Down Expand Up @@ -384,7 +384,8 @@ BEGIN
}

# the time we take the snapshot
my $now=time;
use vars qw($now);
$now=time;
my $installdir = "$buildroot/$branch/inst";
my $dbstarted;

Expand Down Expand Up @@ -707,7 +708,8 @@ END
# releases 8.0 and earlier don't support the standard method for testing
# PLs so only check them for later versions

if (($branch eq 'HEAD' || $branch gt 'REL8_1')
if ( ($branch eq 'HEAD' || $branch gt 'REL8_1')
&& (grep {/--with-(perl|python|tcl)/ } @$config_opts)
&& step_wanted('pl-install-check'))
{

Expand Down Expand Up @@ -902,10 +904,12 @@ sub cleanlogs
sub writelog
{
my $stage = shift;
my $fname = $stage;
$fname = "$fname.log" unless $fname =~ /\./;
my $loglines = shift;
my $handle;
my $lrname = $st_prefix . $logdirname;
open($handle,">$lrname/$stage.log") || die $!;
open($handle,">$lrname/$fname") || die $!;
print $handle @$loglines;
close($handle);
}
Expand Down

0 comments on commit 61ace80

Please sign in to comment.