From: Don Armstrong Date: Fri, 23 Aug 2019 18:05:14 +0000 (-0700) Subject: use open_compresed file and give more output when scanlib fails X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=bc60819259a8752346501fcfada3cf54b974fd0d;hp=91ad9fc533061d873c161102e9d233a96f468d4b;ds=sidebyside use open_compresed file and give more output when scanlib fails --- diff --git a/scanlib.pm b/scanlib.pm index 4b828a3..5ce31a8 100644 --- a/scanlib.pm +++ b/scanlib.pm @@ -19,7 +19,7 @@ use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522); use Debbugs::Packages; use Debbugs::Versions; use Debbugs::Status; -use IO::Uncompress::AnyUncompress; +use Debbugs::Common qw(open_compressed_file); use Fcntl qw(O_RDONLY); use File::Basename; @@ -53,8 +53,11 @@ sub readmaintainers() { sub glob_compressed_fh { my ($fn) = @_; - $fn = (grep { -f $_ } glob $fn)[0]; - my $fh = IO::Uncompress::AnyUncompress->new($fn) or + my @fn = grep { -f $_ } glob $fn; + if (not @fn) { + die "No files exist which match glob '$fn'"; + } + my $fh = open_compressed_file($fn[0]) or die "Unable to open $fn for reading: $!"; return $fh; }