]> git.donarmstrong.com Git - debbugs.git/blobdiff - cgi/bugreport.cgi
use package_maintainer in bugreport
[debbugs.git] / cgi / bugreport.cgi
index 3dddc5e8030bd7ce752c0c669498bd60bbc04efb..41884cf568c9c4de831def5ba28aae50363eed1d 100755 (executable)
@@ -15,24 +15,52 @@ use MIME::Decoder;
 use IO::Scalar;
 use IO::File;
 
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, don't do that.
+use File::Basename qw(dirname);
+use Cwd qw(abs_path);
+our $debbugs_dir;
+BEGIN {
+    $debbugs_dir =
+       abs_path(dirname(abs_path(__FILE__)) . '/../');
+    # clear the taint; we'll assume that the absolute path to __FILE__ is the
+    # right path if there's a .git directory there
+    ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/;
+    if (defined $debbugs_dir and
+       -d $debbugs_dir . '/.git/') {
+    } else {
+       undef $debbugs_dir;
+    }
+    # if the first directory in @INC is not an absolute directory, assume that
+    # someone has overridden us via -I.
+    if ($INC[0] !~ /^\//) {
+    }
+}
+use if defined $debbugs_dir, lib => $debbugs_dir;
+
 use Debbugs::Config qw(:globals :text :config);
 
 # for read_log_records
 use Debbugs::Log qw(:read);
-use Debbugs::CGI qw(:url :html :util :cache);
+use Debbugs::Log::Spam;
+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::DB;
 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 URI::Escape qw(uri_escape_utf8);
+use List::AllUtils qw(max);
 
-use List::Util qw(max);
-
+my $s;
+if (defined $config{database}) {
+    $s = Debbugs::DB->connect($config{database}) or
+        die "Unable to connect to database";
+}
 
 use CGI::Simple;
 my $q = new CGI::Simple;
@@ -185,34 +213,23 @@ if (defined $param{usertag}) {
      }
 }
 
-
-my $buglogfh;
-if ($buglog =~ m/\.gz$/) {
-    my $oldpath = $ENV{'PATH'};
-    $ENV{'PATH'} = '/bin:/usr/bin';
-    $buglogfh = IO::File->new("zcat $buglog |") or quitcgi("open log for $ref: $!");
-    $ENV{'PATH'} = $oldpath;
-} else {
-    $buglogfh = IO::File->new($buglog,'r') or quitcgi("open log for $ref: $!");
-}
-
-
 my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
                                                   bugusertags => \%bugusertags,
+                                                   defined $s?(schema => $s):(),
                                                  ))}
 }
 
 my @records;
+my $spam;
 eval{
-     @records = read_log_records(logfh => $buglogfh,inner_file => 1);
+    @records = read_log_records(bug_num => $ref,inner_file => 1);
+    $spam = Debbugs::Log::Spam->new(bug_num => $ref);
 };
 if ($@) {
      quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
 }
-undef $buglogfh;
-
 
 my $log='';
 my $msg_num = 0;
@@ -283,10 +300,12 @@ END
          $record_wanted_anyway = 1 if record_regex($record,qr/^Received: \(at control\)/);
          next if not $boring and not $record->{type} eq $wanted_type and not $record_wanted_anyway and @records > 1;
          $seen_message_ids{$msg_id} = 1 if defined $msg_id;
+          # skip spam messages if we're outputting more than one message
+          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 {
@@ -337,6 +356,10 @@ else {
                                    \%seen_msg_ids,
                                    trim_headers => $trim_headers,
                                    avatars => $avatars,
+                                  terse => $terse,
+                                   # if we're only looking at one record, allow
+                                   # spam to be output
+                                   spam  => (@records > 1)?$spam:undef,
                                   );
      }
 }
@@ -373,17 +396,29 @@ for my $p_a (qw(package affects)) {
     foreach my $pkg (make_list($status{$p_a})) {
         if ($pkg =~ /^src\:/) {
             my ($srcpkg) = $pkg =~ /^src:(.*)/;
+            my @maint = package_maintainer(source => $srcpkg,
+                                           @schema_arg,
+                                          );
             $packages_affects{$p_a}{$pkg} =
-               {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
+               {maintainer => @maint?\@maint : ['(unknown)'],
                 source     => $srcpkg,
                 package    => $pkg,
                 is_source  => 1,
                };
         }
         else {
+            my @maint = package_maintainer(binary => $pkg,
+                                           @schema_arg,
+                                          );
+            my $source =
+                binary_to_source(binary => $pkg,
+                                 source_only => 1,
+                                 scalar_only => 1,
+                                 @schema_arg,
+                                );
             $packages_affects{$p_a}{$pkg} =
-               {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
-                exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
+               {maintainer => @maint?\@maint : '(unknown)',
+                length($source)?(source => $source):(),
                 package    => $pkg,
                };
         }
@@ -422,7 +457,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};
    }
 }
@@ -459,14 +496,21 @@ print fill_in_template(template => 'cgi/bugreport',
                                     msg           => $msg,
                                     isstrongseverity => \&Debbugs::Status::isstrongseverity,
                                     html_escape   => \&Debbugs::CGI::html_escape,
+                                     uri_escape    => \&URI::Escape::uri_escape_utf8,
                                     looks_like_number => \&Scalar::Util::looks_like_number,
                                     make_list        => \&Debbugs::Common::make_list,
                                    },
                       hole_var  => {'&package_links' => \&Debbugs::CGI::package_links,
                                     '&bug_links'     => \&Debbugs::CGI::bug_links,
                                     '&version_url'   => \&Debbugs::CGI::version_url,
-                                    '&bug_url'       => \&Debbugs::CGI::bug_url,
                                     '&strftime'      => \&POSIX::strftime,
                                     '&maybelink'     => \&Debbugs::CGI::maybelink,
                                    },
                      );
+
+__END__
+
+# Local Variables:
+# indent-tabs-mode: nil
+# cperl-indent-level: 4
+# End: