for CGI running out of git, just unshift @INC instead of use lib

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 2c461c93cb5d126eeb382f381088576cc7452e2b..eb8e54f7f8ee1acd21a973813614a83b1b259034 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -T
 # This script is part of debbugs, and is released
 # under the terms of the GPL version 2, or any later
 # version at your option.
@@ -39,8 +39,11 @@ BEGIN {
     if ($INC[0] !~ /^\//) {
        undef $debbugs_dir;
     }
+    if (defined $debbugs_dir) {
+       unshift @INC, $debbugs_dir.'/lib/';
+    }
 }
-use if defined $debbugs_dir, lib => $debbugs_dir;
+
 
 binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
@@ -474,7 +477,9 @@ my %bugs;
 my $bugs = Debbugs::Collection::Bug->
     new(bugs => \@bugs,
        @schema_arg,
-       users => [map {Debbugs::User->new($_)} @users],
+       users => [map {my $u = Debbugs::User->new($_);
+                      $u->has_bug_tags()?($u):()
+                  } @users],
        );
 
 $bugs->load_related_packages_and_versions();