filecheck: Fix bug that prevented File::MimeInfo::Magic from ever being used.

master
Joey Hess 2012-11-04 12:02:26 -04:00
parent 3b120dd767
commit 286026877d
3 changed files with 11 additions and 1 deletions

View File

@ -139,7 +139,7 @@ sub match_mimetype ($$;@) {
my $mimeinfo_ok=! $@; my $mimeinfo_ok=! $@;
my $mimetype; my $mimetype;
if ($mimeinfo_ok) { if ($mimeinfo_ok) {
my $mimetype=File::MimeInfo::Magic::magic($file); $mimetype=File::MimeInfo::Magic::magic($file);
} }
# Fall back to using file, which has a more complete # Fall back to using file, which has a more complete

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ikiwiki (3.20121018) UNRELEASED; urgency=low
* filecheck: Fix bug that prevented File::MimeInfo::Magic from ever
being used.
-- Joey Hess <joeyh@debian.org> Sun, 04 Nov 2012 11:59:10 -0400
ikiwiki (3.20121017) unstable; urgency=low ikiwiki (3.20121017) unstable; urgency=low
* recentchangesdiff: fix further breakage to the template from 3.20120725 * recentchangesdiff: fix further breakage to the template from 3.20120725

View File

@ -42,3 +42,6 @@ I found on [[plugins/filecheck/discussion/]] what [[users/DavidBremner/]] descri
But I can't figure out if my issue is boarder and includes this or not.. But I can't figure out if my issue is boarder and includes this or not..
Any ideas , solve :) more that welcome. Any ideas , solve :) more that welcome.
> [[done]], as isbear noted in [[discussion]], there was a bug that
> prevented File::MimeInfo::Magic from ever being used. --[[Joey]]