Author: rjung Date: Thu Nov 1 12:44:09 2018 New Revision: 1845463 URL: http://svn.apache.org/viewvc?rev=1845463&view=rev Log: Make sure the two lists TOMCAT_ONLY and TOMCAT_KEEP are disjoint.
Modified: tomcat/trunk/res/scripts/check-mime.pl Modified: tomcat/trunk/res/scripts/check-mime.pl URL: http://svn.apache.org/viewvc/tomcat/trunk/res/scripts/check-mime.pl?rev=1845463&r1=1845462&r2=1845463&view=diff ============================================================================== --- tomcat/trunk/res/scripts/check-mime.pl (original) +++ tomcat/trunk/res/scripts/check-mime.pl Thu Nov 1 12:44:09 2018 @@ -181,6 +181,18 @@ if ($opt_m eq '' || $opt_i eq '' || $opt # Switch locale for alphabetical ordering setlocale(LC_COLLATE, $LOCALE); +# Check whether TOMCAT_ONLY and TOMCAT_KEEP are disjoint +for $extension (sort keys %TOMCAT_ONLY) { + if (exists($TOMCAT_KEEP{$extension})) { + push(@extensions, ($extension)); + } +} +if (@extensions > 0) { + print STDERR "FATAL Lists TOMCAT_ONLY and TOMCAT_KEEP must be disjoint.\n"; + print STDERR "FATAL Common entries are: " . join(', ', @extensions) . " - Aborting!\n"; + exit 6; +} + # Read and parse httpd mime.types, build up hash extension->mime-type open($mimetypes_fh, '<', $opt_m) or die "Could not open file '$opt_m' for read - Aborting!"; while (<$mimetypes_fh>) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org