[doc] create-mime.conf.pl -v silent for mult vnd
Do not issue trace if multiple */vnd.* register the same extension (silently mark mime-type for extension as application/octet-stream)personal/stbuehler/tests-path
parent
8faa456fc8
commit
0b4733f244
|
@ -125,7 +125,8 @@ sub add {
|
|||
|
||||
# non-vnd.* subtype wins over vnd.* subtype
|
||||
my $have_vnd = ($have_subtype =~ /^vnd\./);
|
||||
if (($subtype =~ /^vnd\./) ^ $have_vnd) {
|
||||
my $vnd = ($subtype =~ /^vnd\./);
|
||||
if ($vnd ^ $have_vnd) {
|
||||
if ($have_vnd) {
|
||||
return set @_; # overwrite
|
||||
}
|
||||
|
@ -134,7 +135,9 @@ sub add {
|
|||
}
|
||||
}
|
||||
|
||||
print STDERR "Duplicate mimetype: '${extension}' => '${mimetype}' (already have '${have}'), merging to 'application/octet-stream'\n" if $verbose;
|
||||
if ($verbose && !$vnd) {
|
||||
print STDERR "Duplicate mimetype: '${extension}' => '${mimetype}' (already have '${have}'), merging to 'application/octet-stream'\n"
|
||||
}
|
||||
set ($extension, 'application/octet-stream');
|
||||
} else {
|
||||
set @_;
|
||||
|
|
Loading…
Reference in New Issue