Fix numeric comparisons with undef

[git.ikiwiki.info.git] / IkiWiki / Plugin / filecheck.pm

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 3b0a7b3148d4edc2bb5bf1c8d11af474dc28a1c7..6e65283983b472fe26c86351fb6572ec5ae51865 100644 (file)
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -48,7 +48,6 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

-                       section => "misc",

                },
 }
 
                },
 }
 


@@ -140,7 +139,7 @@ sub match_mimetype ($$;@) {
        my $mimeinfo_ok=! $@;
        my $mimetype;
        if ($mimeinfo_ok) {
        my $mimeinfo_ok=! $@;
        my $mimetype;
        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


@@ -151,7 +150,7 @@ sub match_mimetype ($$;@) {
                chomp $mimetype;
                close $file_h;
        }
                chomp $mimetype;
                close $file_h;
        }

-       if (! defined $mimetype || $mimetype !~s /;.*//) {
+       if (! defined $mimetype) {

                # Fall back to default value.
                $mimetype=File::MimeInfo::Magic::default($file)
                        if $mimeinfo_ok;
                # Fall back to default value.
                $mimetype=File::MimeInfo::Magic::default($file)
                        if $mimeinfo_ok;


@@ -159,9 +158,11 @@ sub match_mimetype ($$;@) {
                        $mimetype="unknown";
                }
        }
                        $mimetype="unknown";
                }
        }

+       # Ignore any parameters, we only want the type itself
+       $mimetype =~ s/;.*//;

 
        my $regexp=IkiWiki::glob2re($wanted);
 
        my $regexp=IkiWiki::glob2re($wanted);

-       if ($mimetype!~/^$regexp$/i) {
+       if ($mimetype!~$regexp) {

                return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
        }
        else {
                return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
        }
        else {