epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge Release.pm fix from 3.16 into 3.17

Browse Source
This commit is contained in:
Andrew Johnson
2017-12-06 16:55:51 -06:00
parent ab555a280b 8e2b782b7c
commit 20312f82ed
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/EPICS/Release.pm
View File

@@ -43,16 +43,16 @@ sub readReleaseFiles {
# Parse a configure/RELEASE* file and anything it includes
#
sub readRelease {
my ($file, $Rmacros, $Rapps, $Rdone) = @_;
# $Rmacros and $Rdone are hash-refs, $Rapps an array-ref
my ($file, $Rmacros, $Rapps, $Ractive) = @_;
# $Rmacros and $Ractive are hash-refs, $Rapps an array-ref
if (exists $Rdone->{$file}) {
if ($Ractive->{$file} > 0) {
die "Release.pm: Recursive loop found in RELEASE files,\n" .
"discovered in $file\n";
}
open(my $IN, '<', $file) or croak "Can't open $file: $!\n";
$Rdone->{$file}++;
$Ractive->{$file}++;
while (<$IN>) {
chomp;
s/ \r $//x; # Shouldn't need this, but sometimes...
@@ -77,11 +77,12 @@ sub readRelease {
my ($op, $path) = m/^ \s* (-? include) \s+ (.*)/x;
$path = expandMacros($path, $Rmacros);
if (-e $path) {
&readRelease($path, $Rmacros, $Rapps, $Rdone);
&readRelease($path, $Rmacros, $Rapps, $Ractive);
} elsif ($op eq "include") {
carp "EPICS/Release.pm: Include file '$path' not found\n";
}
}
$Ractive->{$file}--;
close $IN;
}