diff options
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/scripts/create-mime.conf.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/scripts/create-mime.conf.pl b/doc/scripts/create-mime.conf.pl index 2a228434..dcadf297 100755 --- a/doc/scripts/create-mime.conf.pl +++ b/doc/scripts/create-mime.conf.pl @@ -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 @_; |