Remove the tests for "not in testing"; they are no longer much use.

diff --git a/bugcounts b/bugcounts
index 4c2200533232dddbf03e1dba35790b7745796bd4..3051b19a9074df34c68b5c1ceed5f52d50a3ffa2 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -42,7 +42,6 @@ my $total=0;          # total number of bugs
 my $patchcount=0;      # Number of bugs that have a fix proposed
 my $pendingcount=0;    # Number of bugs that will have a fix uploaded RSN
 my $ignorecount=0;      # Number of bugs being ignored
-my $nottestingcount=0; # Number of bugs on packages not in testing
 my $worrycount=0;      # Number of bugs we're actually worried about
 
 for my $p (keys %scanlib::packagelist) {
@@ -53,9 +52,8 @@ for my $p (keys %scanlib::packagelist) {
                $pendingcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
                $patchcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
                $ignorecount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
-               $nottestingcount++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
                $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
        }
 }
 
-printf("%d %d %d 0 %d %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $nottestingcount, $worrycount);
+printf("%d %d %d 0 %d 0 %d\n", $total, $pendingcount, $patchcount, $ignorecount, $worrycount);

diff --git a/bugreport b/bugreport
index 1686ae88e0ab0ab86dc76b5277d32276d381d64c..f1501c32cbe35135a0c9be6b79a6591bb80eb4d7 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -123,7 +123,6 @@ 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 $nottestingtotal=0;  # Total number of bugs on packages not in testing
        my $worrytotal=0;       # Total number of bugs we're actually worried about
        my %list;               # List of bugnumber associated with package
 
@@ -135,7 +134,6 @@ sub MakeStatistics() {
                        $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++ if (scanlib::check_worry($scanlib::bugs{$nr}));
 
                        if (not defined($scanlib::exclude{$nr})) {
@@ -150,14 +148,12 @@ 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 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 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);
        }
 }

diff --git a/dohtml b/dohtml
index 5ed9927733b775ab59201195e2579787afa5d498..d22056c0ad2e35018cf270b0ff97fc6572cdb200 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -57,8 +57,7 @@ tags</a>:
 <p>
 The second set of tags indicate what releases a bug applies to:
 O for oldstable (woody), S for stable (sarge), T for testing (etch),
-U for unstable (sid) or E for experimental. X indicates that the
-package is not in testing.
+U for unstable (sid) or E for experimental.
 
 <p>
 

diff --git a/makepost b/makepost
index 0affebfc230f444ddf6e59ba3fee26b106a847a3..76b76d097d1aef4e4e23949f13f469a13b9c938f 100755 (executable)
--- a/makepost
+++ b/makepost
@@ -24,8 +24,7 @@ Explanation for bug tags:
 
 The second set of tags indicate what releases a bug applies to:
 O for oldstable (woody), S for stable (sarge), T for testing (etch),
-U for unstable (sid) or E for experimental. X indicates that the
-package is not in testing.
+U for unstable (sid) or E for experimental.
 
 ------------------------------------------------------------------------------
 EOF

diff --git a/scanlib.pm b/scanlib.pm
index 65adb6312e18fff97c260f87f311071e49436452..40f293092d58c6b3de23aaef545130d58b15ac84 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -202,14 +202,10 @@ sub scanspooldir() {
 
                                # This is needed for now
                                my $exists = 0;
-                               for my $arch (@bugcfg::architectures) {
-                                       for my $pkg (split /[,\s]+/, $bug->{'package'}) {
-                                               my @versions = Debbugs::Packages::getversions($pkg, $dist, $arch);
-                                               $exists = 1 if (scalar @versions > 0);
-                                       }
-                                       last if $exists;
+                               for my $pkg (split /[,\s]+/, $bug->{'package'}) {
+                                       my @versions = Debbugs::Packages::getversions($pkg, $dist, undef);
+                                       $exists = 1 if (scalar @versions > 0);
                                }
-
                                next if !$exists;
 
                                my $presence = Debbugs::Status::bug_presence(
@@ -250,14 +246,6 @@ sub scanspooldir() {
 
                for my $package (split /[,\s]+/, $bug->{'package'}) {
                        $_= $package; y/A-Z/a-z/; $_= $` if m/[^-+._a-z0-9]/;
-                       if (not defined $section{$_}) {
-                               if (defined $debbugssection{$_}) {
-                                       $relinfo .= "X";
-                               } else {
-                                       next;   # Skip unavailable packages
-                               }
-                       }
-
                        push @{$packagelist{$_}}, $f;
                }
 
@@ -333,7 +321,6 @@ sub check_worry {
        my ($status) = @_;
 
        if ($status =~ m/^\[[^]]*I/ or
-           $status =~ m/ \[[^]]*X/ or
             $status !~ m/ \[[^]]*T/) {
                return 0;
        }