# HG changeset patch # User Simon Howkins # Date 1287592221 -3600 # Node ID 2a30d4157dddfe6ebeea068d883e8d23dd71c98c # Parent 116cb28ed58685069a626d19350953699308facb Script now outputs info message if sources.csv specifies a file that's not in the package (irrespective of whether it will try to use it). diff -r 116cb28ed586 -r 2a30d4157ddd common/tools/csvToSysDef.pl --- a/common/tools/csvToSysDef.pl Wed Oct 20 15:19:52 2010 +0100 +++ b/common/tools/csvToSysDef.pl Wed Oct 20 17:30:21 2010 +0100 @@ -59,10 +59,11 @@ if (!-f $pkgDef) { # Not there, so look for the pkg defn in the root of the package tree - warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst}; + warn "WARNING: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst}; $pkgDef = "$package->{dst}/$package->{sysdef}"; } - die "Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef; + warn "INFO: sources.csv lists '$package->{sysdef}', which is not supplied in $package->{dst}\n" if -d "$package->{dst}" && !-f "$package->{dst}/$package->{sysdef}"; + die "ERROR: Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef; warn "Including $pkgDef for $package->{dst}\n"; my $pkgTree = eval { $parser->parsefile($pkgDef) } or die "Failed to parse $pkgDef : $@";