Change the format of the status file to be something much closer to the

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index 63f887412bc5c2e44e0c564ceca1e55e949f77ba..eee96b3019c17c56cca8fcba2a51be2b5c1bd9cc 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -12,9 +12,6 @@ use warnings;
 my $Version            = "BugReport 1.4\nCopyright (C) 1998-2002 Wichert Akkerman <wakkerma\@debian.org>\n";
 my $html               = 0;
 my $statusfile         = "status";
 my $Version            = "BugReport 1.4\nCopyright (C) 1998-2002 Wichert Akkerman <wakkerma\@debian.org>\n";
 my $html               = 0;
 my $statusfile         = "status";

-my $NMUfile            = "/debian/home/doogie/public_html/incoming/bugs_closed";
-$NMUfile               = "/debian/home/doogie/chgscan/db/bugs_closed"; # Changed as of request by dark  -Joey, 99/11/22
-$NMUfile               = "http://auric.debian.org/~doogie/incoming/bugs_closed"; # Changed as of request by dark  -Joey, 99/11/22

 
 sub ShowVersion() {
        print "$Version\n";
 
 sub ShowVersion() {
        print "$Version\n";


@@ -45,9 +42,13 @@ sub PrintPackageHeader() {
        if ($html) {
                print "<div class=\"package\"><pre>";
                print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);
        if ($html) {
                print "<div class=\"package\"><pre>";
                print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);

-               print " ($scanlib::section{$p}).\n";
+               if (defined($scanlib::section{$p})) {
+                       print " ($scanlib::section{$p}).\n";
+               } else {
+                       print " (unknown).\n";
+               }

                print "<strong>Maintainer:</strong> ";
                print "<strong>Maintainer:</strong> ";

-               if (defined($scanlib::maintainer{$p})) {
+               if (exists($scanlib::maintainer{$p}) && $scanlib::maintainer{$p} ne '') {

                        if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
                                ($name,$email) = ($1,$2);
                        } elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
                        if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
                                ($name,$email) = ($1,$2);
                        } elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {


@@ -55,7 +56,11 @@ sub PrintPackageHeader() {
                        } elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
                                $name = $email = $1;
                        }
                        } elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
                                $name = $email = $1;
                        }

-                       print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
+                       if (defined($name)) {
+                               print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
+                       } else {
+                               print "$scanlib::maintainer{$p}\n";
+                       }

                } else {
                        print "unknown\n";
                }
                } else {
                        print "unknown\n";
                }


@@ -111,7 +116,6 @@ sub MakeBuglist() {
                        } else {
                                printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
                        }
                        } else {
                                printf("  %-6d %s\n", $nr, $scanlib::bugs{$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 ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
                                                      $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
                }


@@ -127,8 +131,8 @@ sub MakeStatistics() {
        my $patchtotal=0;       # Total number of bugs marked patch
        my $pendingtotal=0;     # Total number of bugs marked pending
        my $ignoretotal=0;      # Total number of bugs marked ignore
        my $patchtotal=0;       # Total number of bugs marked patch
        my $pendingtotal=0;     # Total number of bugs marked pending
        my $ignoretotal=0;      # Total number of bugs marked ignore

-       my $nottestingtotal=0;  # Total number of bugs on packages not in testing

        my $worrytotal=0;       # Total number of bugs we're actually worried about
        my $worrytotal=0;       # Total number of bugs we're actually worried about

+       my $stabletotal=0;      # Total number of bugs affecting stable

        my %list;               # List of bugnumber associated with package
 
        for my $p (sort keys %scanlib::packagelist) {
        my %list;               # List of bugnumber associated with package
 
        for my $p (sort keys %scanlib::packagelist) {


@@ -136,11 +140,11 @@ sub MakeStatistics() {
 
                next if (defined $scanlib::exclude{$p});
                for my $nr (@{$scanlib::packagelist{$p}}) {
 
                next if (defined $scanlib::exclude{$p});
                for my $nr (@{$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/);
+                       $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
+                       $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'});

                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));

+                       $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));

 
                        if (not defined($scanlib::exclude{$nr})) {
                                $bugcount++;
 
                        if (not defined($scanlib::exclude{$nr})) {
                                $bugcount++;


@@ -154,14 +158,14 @@ sub MakeStatistics() {
                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 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 current stable release:</strong> %d<BR>\n", $stabletotal);

                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 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("<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 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 current stable release: %d<P>\n", $stabletotal);

                printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
        }
 }
                printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
        }
 }


@@ -191,7 +195,6 @@ $statusfile=$opt_S if ($opt_S);
 $html=1 if ($opt_H);
 
 scanlib::readstatus($statusfile);
 $html=1 if ($opt_H);
 
 scanlib::readstatus($statusfile);

-# scanlib::readNMUstatus($NMUfile);

 
 FilterPackages($opt_d) if ($opt_d);
 FilterBugs() if ($opt_t);
 
 FilterPackages($opt_d) if ($opt_d);
 FilterBugs() if ($opt_t);