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

Merge 3.16 into core/master

Browse Source
This commit is contained in:
Andrew Johnson
2018-03-22 23:27:26 -05:00
parent 387b536a46 a3c01bbf77
commit 0014853b99
11 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/convertRelease.pl
+4 -4
View File
@@ -246,10 +246,10 @@ sub checkRelease {
AbsPath($macros{$parent}) ne AbsPath($ppath)) {
print "\n" unless ($status);
print "Definition of $parent conflicts with $app support.\n";
print "In this application a RELEASE file defines\n";
print "\t$parent = $macros{$parent}\n";
print "but $app at $path defines\n";
print "\t$parent = $ppath\n";
print "In this application or module, a RELEASE file\n";
print "conflicts with $app at $path\n";
print " Here: $parent = $macros{$parent}\n";
print " $app: $parent = $ppath\n";
$status = 1;
}
}