X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=e61b2bfe24525d564a34e5789bb618f690d4986c;hb=9dd439703f28e782980380687a9c9325de2ae80c;hp=226258a1b26063fc48ed17d9ef5470289a3412c2;hpb=fdffad3b44892e2049aa2bc2588bf4ee991360ef;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 226258a..e61b2bf 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -15,6 +15,29 @@ 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
@@ -22,10 +45,11 @@ use Debbugs::Log qw(:read);
 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::Common qw(buglog getmaintainers make_list bug_status package_maintainer);
+use Debbugs::Packages qw(binary_to_source);
 use Debbugs::DB;
 use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
+use Debbugs::Bug;
 
 use Scalar::Util qw(looks_like_number);
 
@@ -34,9 +58,11 @@ use URI::Escape qw(uri_escape_utf8);
 use List::AllUtils qw(max);
 
 my $s;
+my @schema_arg = ();
 if (defined $config{database}) {
     $s = Debbugs::DB->connect($config{database}) or
-        die "Unable to connect to database";
+        die "Unable to connect to DB";
+    @schema_arg = ('schema',$s);
 }
 
 use CGI::Simple;
@@ -190,19 +216,21 @@ if (defined $param{usertag}) {
      }
 }
 
+my $bug = Debbugs::Bug->new(bug => $ref,
+                            @schema_arg,
+                           );
+
 my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
 						   bugusertags => \%bugusertags,
-                                                   defined $s?(schema => $s):(),
+                                                   @schema_arg,
 						  ))}
 }
 
 my @records;
-my $spam;
 eval{
-    @records = read_log_records(bug_num => $ref,inner_file => 1);
-    $spam = Debbugs::Log::Spam->new(bug_num => $ref);
+    @records = $bug->log_records();
 };
 if ($@) {
      quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
@@ -278,7 +306,7 @@ END
 	  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);
+          next if @records > 1 and $bug->is_spam($msg_id);
       my @lines;
       if ($record->{inner_file}) {
           push @lines, scalar $record->{fh}->getline;
@@ -336,7 +364,7 @@ else {
 				   terse => $terse,
                                    # if we're only looking at one record, allow
                                    # spam to be output
-                                   spam  => (@records > 1)?$spam:undef,
+                                   spam  => (@records > 1)?$bug:undef,
                                   );
      }
 }
@@ -347,24 +375,13 @@ $log = join("\n",@log);
 
 # All of the below should be turned into a template
 
-my %maintainer = %{getmaintainers()};
-my %pkgsrc = %{getpkgsrc()};
-
 my $indexentry;
 my $showseverity;
 
-my $tpack;
-my $tmain;
-
-my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
-
 unless (%status) {
     no_such_bug($q,$ref);
 }
 
-#$|=1;
-
-
 my @packages = make_list($status{package});
 
 
@@ -421,7 +438,7 @@ my @blockedby= make_list($status{blockedby});
 $status{blockedby_array} = [];
 if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
     for my $b (@blockedby) {
-        my %s = %{get_bug_status($b)};
+        my %s = %{get_bug_status($b,@schema_arg)};
         next if (defined $s{pending} and
                  $s{"pending"} eq 'fixed') or
                      length $s{done};
@@ -433,7 +450,7 @@ my @blocks= make_list($status{blocks});
 $status{blocks_array} = [];
 if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) {
     for my $b (@blocks) {
-        my %s = %{get_bug_status($b)};
+        my %s = %{get_bug_status($b,@schema_arg)};
         next if $s{"pending"} eq 'fixed' || length $s{done};
 	push @{$status{blocks_array}}, {bug_num => $b, subject => $s{subject}, status => \%s};
     }
@@ -452,7 +469,8 @@ print $q->header(-type => "text/html",
 		);
 
 print fill_in_template(template => 'cgi/bugreport',
-		       variables => {status => \%status,
+		       variables => {bug => $bug,
+                                     status => \%status,
 				     package => $packages_affects{'package'},
 				     affects => $packages_affects{'affects'},
 				     log           => $log,