]> git.donarmstrong.com Git - bugscan.git/blobdiff - bugreport
There's no need for %packagelist to be a space-delimited list of bug
[bugscan.git] / bugreport
index f6be50a60c198761dde79b126e90981cf1b43048..f9654bbd03aefb2e94070aa96737de20ac731c18 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -45,13 +45,18 @@ sub PrintPackageHeader() {
        my ($name, $email);     # Name & email of maintainer
 
        if ($html) {
-           print "<div class=\"package\"><pre>";
-               print "<a name=\"$p\"><strong>Package:</strong></a> " . &wwwname($p);
+               print "<div class=\"package\"><pre>";
+               print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);
                print " ($scanlib::section{$p}).\n";
                print "<strong>Maintainer:</strong> ";
                if (defined($scanlib::maintainer{$p})) {
-                       $_ = $scanlib::maintainer{$p};
-                       ($name,$email) = m/(.*) <([^>]*)>/;
+                       if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
+                               ($name,$email) = ($1,$2);
+                       } elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
+                               ($name,$email) = ($1,$2);
+                       } elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
+                               $name = $email = $1;
+                       }
                        print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
                } else {
                        print "unknown\n";
@@ -77,7 +82,7 @@ sub MakeBuglist() {
        my $header;             # Flag if packagename has already been printed
        my $fontset;            # Did we change the font?
 
-       for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
+       for my $p (sort {$a->[0] <=> $b->[0]} keys %scanlib::packagelist) {
                next if (defined $bugcfg::exclude{$p});
                $header = 0;
                $fontset = 0;
@@ -92,137 +97,3 @@ sub MakeBuglist() {
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};
                }
-               for $nr (sort split(/ /, $scanlib::packagelist{$p})) {
-                       next if (defined $bugcfg::exclude{$nr});
-                       if (! $header) {
-                               $header = 1;
-                               &PrintPackageHeader($p);
-                       }
-
-                       if ($html) {
-                               my $worry = scanlib::check_worry($scanlib::bugs{$nr});
-                       
-                               if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-                                       print '<span style="color: #808080">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
-                                       print '<span style="color: #f040d0">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
-                                       print '<span style="color: #00aa00">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
-                                       print '<span style="color: #ffaa30">';
-                               }
-                               print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
-                               print "<em class=\"worry\">" if $worry;
-                               ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-                               print "<A NAME=\"$nr\"></A>  " . &wwwnumber($nr) . ' ' .
-                                         htmlsanit($scanlib::bugs{$nr}) . "\n";
-                               print "</em>" if $worry;
-                               print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
-                       } else {
-                               printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
-                       }
-                       print $scanlib::comments{$nr} if (defined($scanlib::comments{$nr}));
-                       print "[FIX] Fixed by package " . $scanlib::NMU{$nr, "source"} . ", version " . $scanlib::NMU{$nr, "version"} . " in Incoming\n" if (defined $scanlib::NMU{$nr});
-                       print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-                                                     $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
-               }
-               print "</span>" if ($fontset);
-               if ($header) {
-                       &PrintPackageFooter($p);
-               }
-       }
-}
-
-
-sub MakeStatistics() {
-       my $bugcount;           # Total number of bugs so far
-       my $count;              # Number of bugs for this package
-       my $remtotal;           # Total number of bugs for packages marked REMOVE
-       my $patchtotal;         # Total number of bugs marked patch
-       my $pendingtotal;       # Total number of bugs marked pending
-       my $ignoretotal;        # Total number of bugs marked ignore
-       my $nottestingtotal;    # Total number of bugs on packages not in testing
-       my $worrytotal;         # Total number of bugs we're actually worried about
-       my $p;                  # Index variable
-       my %list;               # List of bugnumber associated with package
-
-       $bugcount=0;
-       for my $p (sort keys %scanlib::packagelist) {
-               next if (defined $scanlib::exclude{$p});
-               $count=0;
-               for my $nr (split(/ /, $scanlib::packagelist{$p})) {
-                       $pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
-                       $patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
-                       $ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
-                       $nottestingtotal++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
-                       $worrytotal++ unless (
-                               $scanlib::bugs{$nr} =~ m/^\[[^]]*I/ or
-                               $scanlib::bugs{$nr} =~ m/ \[[^]]*X/ or
-                               ($scanlib::bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $scanlib::bugs{$nr} !~ m/ \[[^]]*T/));
-
-                       if (not defined($scanlib::exclude{$nr})) {
-                               $bugcount++;
-                               $count++;
-                       } 
-               }
-               $remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);
-       }
-
-       if ($html) {
-               print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
-               printf("<strong>Number that will disappear after removing packages marked [REMOVE]:</strong> %d<BR>\n", $remtotal);
-               printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
-               printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
-               printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);
-               printf("<strong>Number on packages not in testing:</strong> %d<BR>\n", $nottestingtotal);
-               printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
-       } else {
-               print "Total number of release-critical bugs: $bugcount\n";
-               printf("Number that will disappear after removing packages marked [REMOVE]: %d\n", $remtotal);
-               printf("Number that have a patch: %d\n", $patchtotal);
-               printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal);
-               printf("Number that are being ignored: %d\n", $ignoretotal);
-               printf("Number on packages not in testing: %d\n", $nottestingtotal);
-               printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
-       }
-}
-
-
-sub FilterPackages($) {
-       my $filter = shift;             # Distribution we want to keep
-
-       for my $p (sort keys %scanlib::packagelist) {
-               delete $scanlib::packagelist{$p} unless ($scanlib::section{$p} =~ m/^$filter/);
-       }
-}
-
-sub FilterBugs() {
-       for my $p (sort keys %scanlib::packagelist) {
-               $scanlib::packagelist{$p} = join(' ', grep { check_worry($scanlib::bugs{$_}) } split / /, $scanlib::packagelist{$p});
-               delete $scanlib::packagelist{$p} if ($scanlib::packagelist{$p} eq '');
-       }
-}
-
-our ($opt_h,$opt_V,$opt_S,$opt_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
-
-getopts('VhHlstd:S:C:');
-ShowUsage if ($opt_h);
-ShowVersion if ($opt_V);
-$statusfile=$opt_S if ($opt_S);
-$commentsfile=$opt_C if ($opt_C);
-$html=1 if ($opt_H);
-
-scanlib::readstatus($statusfile);
-scanlib::readcomments($commentsfile);
-# scanlib::readNMUstatus($NMUfile);
-
-FilterPackages($opt_d) if ($opt_d);
-FilterBugs() if ($opt_t);
-
-MakeStatistics if ($opt_s);
-if ($opt_l) {
-       MakeBuglist();
-}
-
-exit 0;
-