Make sure the two lists TOMCAT_ONLY and TOMCAT_KEEP

are disjoint.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1845463 13f79535-47bb-0310-9956-ffa450edef68

res/scripts/check-mime.pl

@@ -181,6 +181,18 @@ sub HELP_MESSAGE {
 # 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>) {