use scalar IO::InnerFile::getline to work around an InnerFile bug

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 3ff1cb5c7d2759adae51ff8eb104a2674119dfb6..2202ca0cae3e9b16dbb62716931a11e5905b1a61 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -20,19 +20,17 @@ use Debbugs::Config qw(:globals :text :config);
 # for read_log_records
 use Debbugs::Log qw(:read);
 use Debbugs::Log::Spam;
-use Debbugs::CGI qw(:url :html :util :cache);
+use Debbugs::CGI qw(:url :html :util :cache :usertags);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
 
-use Debbugs::User;
-
 use Scalar::Util qw(looks_like_number);
 
 use Debbugs::Text qw(:templates);
 
-use List::Util qw(max);
+use List::AllUtils qw(max);
 
 
 use CGI::Simple;
@@ -276,8 +274,8 @@ END
           next if @records > 1 and $spam->is_spam($msg_id);
       my @lines;
       if ($record->{inner_file}) {
-          push @lines, $record->{fh}->getline;
-          push @lines, $record->{fh}->getline;
+          push @lines, scalar $record->{fh}->getline;
+          push @lines, scalar $record->{fh}->getline;
           chomp $lines[0];
           chomp $lines[1];
       } else {
@@ -417,7 +415,9 @@ $status{blockedby_array} = [];
 if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
     for my $b (@blockedby) {
         my %s = %{get_bug_status($b)};
-        next if $s{"pending"} eq 'fixed' || length $s{done};
+        next if (defined $s{pending} and
+                 $s{"pending"} eq 'fixed') or
+                     length $s{done};
        push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
    }
 }