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

Don't check empty (overridden) RELEASE definitions

Browse Source 
Bug reported by Dirk Zimoch
This commit is contained in:
Andrew Johnson
2019-11-11 11:29:03 -06:00
parent db4ad455d2
commit 961dd2bc5d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/convertRelease.pl
+9 -7
View File
@@ -242,24 +242,26 @@ sub checkRelease {
my $latest = AbsPath($macros{$app});
my %paths = ($latest => $app);
foreach $app (@modules) {
my $path = AbsPath($macros{$app});
my $val = $macros{$app};
next if $val eq '';
my $path = AbsPath($val);
if ($path ne $latest && exists $paths{$path}) {
my $prev = $paths{$path};
print "\n" unless ($status);
print "This application's RELEASE file(s) define\n";
print "\t$app = $macros{$app}\n";
print "after but not adjacent to\n\t$prev = $macros{$prev}\n";
print "\t$app = $val\n";
print "and\n\t$prev = $macros{$prev}\n";
print "both of which resolve to $path\n"
if $path ne $macros{$app} || $path ne $macros{$prev};
if $path ne $val || $path ne $macros{$prev};
$status = 2;
}
$paths{$path} = $app;
$latest = $path;
}
if ($status == 2) {
print "Module definitions that share paths must be grouped together.\n";
print "Either remove a definition, or move it to a line immediately\n";
print "above or below the other(s).\n";
print "Module definitions that share the same path must have their\n";
print "first definitions grouped together. Either remove a module,\n";
print "or arrange them so all those with that path are adjacent.\n";
print "Any non-module definitions belong in configure/CONFIG_SITE.\n";
$status = 1;
}