Mercurial > repos > other > Puppet

comparison common/spamassassin-vba-macro-master/ole2macro.pm @ 178:808462de684a puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle possible "undef" from FileMagic that causes warnings
author IBBoard <dev@ibboard.co.uk>
date Sat, 12 May 2018 10:05:12 +0100
parents dae1088dd218
children
comparison
equal deleted inserted replaced
177:1b605c38b375 178:808462de684a
119 my ($name, $part) = @_; 119 my ($name, $part) = @_;
120 120
121 if ($has_mimeinfo){ 121 if ($has_mimeinfo){
122 my $contents_scalar = new IO::Scalar \$part->decode($mime_max_read_size); 122 my $contents_scalar = new IO::Scalar \$part->decode($mime_max_read_size);
123 my $mime_type = File::MimeInfo::Magic::magic($contents_scalar); 123 my $mime_type = File::MimeInfo::Magic::magic($contents_scalar);
124 return($mime_type eq "application/zip"); 124 return(defined $mime_type && $mime_type eq "application/zip");
125 }else{ 125 }else{
126 return($name =~ /(?:zip)$/); 126 return($name =~ /(?:zip)$/);
127 } 127 }
128 } 128 }
129 129