diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
| commit | 75196e76b627709a6ecae3fa948e1fba7928a5ce (patch) | |
| tree | 6aa2baeb9cc68f98ca256ce0ff5cb20909f52ef9 /IkiWiki/Plugin/filecheck.pm | |
| parent | 8c2962ec48ae57605d6d0e297be437a97b6229ca (diff) | |
| parent | e5ed3c9e3801360cc00ce4f4f325f68ac0770bff (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/filecheck.pm')
| -rw-r--r-- | IkiWiki/Plugin/filecheck.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index a78058ffe..4f4e67489 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -148,6 +148,7 @@ sub match_mimetype ($$;@) { if (! defined $mimetype) { open(my $file_h, "-|", "file", "-bi", $file); $mimetype=<$file_h>; + chomp $mimetype; close $file_h; } if (! defined $mimetype || $mimetype !~s /;.*//) { @@ -160,7 +161,7 @@ sub match_mimetype ($$;@) { } my $regexp=IkiWiki::glob2re($wanted); - if ($mimetype!~/^$regexp$/i) { + if ($mimetype!~$regexp) { return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted"); } else { |