debbugs now checks the package presence for us, so drop the little hack.

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index b1bd14cedbd6a006156419b58aafa28ee89dd4da..398687ba0e4011762e49dfdec80fc0fb2d4a2c49 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -6,13 +6,11 @@
 # which was based on an unknown other script.
 #
 # Global variables:
-#   %comments       - map from bugnumber to bug description
 #   %premature      - list of prematurely closed bugreports
 #   %exclude        - list of bugreports to exclude from the report
 #   %maintainer     - map from packagename to maintainer
 #   %section        - map from packagename to section in the FTP-site
 #   %packagelist    - map from packagename to bugreports
-#   %NMU            - map with NMU information
 
 use lib qw(/org/bugs.debian.org/perl);
 use LWP::UserAgent;
@@ -26,43 +24,7 @@ use warnings;
 require bugcfg;
 package scanlib;
 
-our (%comments,%premature,%exclude,%maintainer,%section,%packagelist,%NMU,%debbugssection,%bugs);
-
-sub readcomments() {
-# Read bug commentary 
-# It is in paragraph format, with the first line of each paragraph being
-# the bug number or package name to which the comment applies.
-# Prefix a bug number with a * to force it to be listed even if it's closed.
-# (This deals with prematurely closed bugs)
-
-       my $index;                                      # Bug-number for current comment
-       my $file;                                       # Name of comments-file
-
-       %comments = ();                                 # Initialize our data
-       %premature = ();
-       %exclude = ();
-       $file=shift;
-       open(C, $file) or die "open $file: $!\n";
-       while (<C>) {
-               chomp;
-               if (m/^\s*$/) {                         # Check for paragraph-breaks
-                       undef $index;
-               } elsif (defined $index) {
-                       $comments{$index} .= $_ . "\n";
-               } else {
-                       if (s/^\*//) {                  # Test & remove initial *
-                               $premature{$_} = 1;
-                       }
-                       if (s/\s+EXCLUDE\s*//) {        # Test & remove EXCLUDE
-                               $exclude{$_} = 1;
-                               next;
-                       }
-                       $index = $_;
-                       $comments{$index} = ''; # New comment, initialize data
-               }
-       }
-       close(C);
-}
+our (%premature,%exclude,%maintainer,%section,%packagelist,%debbugssection,%bugs);
 
 
 # Read the list of maintainer 
@@ -242,7 +204,7 @@ sub scanspooldir() {
                                        bug => $f, 
                                        status => $bug, 
                                        dist => $dist, 
-                                       arch => [ qw(alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc) ]
+                                       arch => \@bugcfg::architectures
                                );
 
                                # ignore bugs that are absent/fixed in this distribution, include everything
@@ -276,14 +238,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;
                }
 
@@ -325,39 +279,6 @@ sub readstatus() {
 }
 
 
-sub readNMUstatus() {
-       my $bug;       # Number of current bug
-       my $source;    # Source upload which closes this bug.
-       my $version;   # Version where this bug was closed.
-       my $flag;      # Whether this paragraph has been processed.
-       my ($field, $value);
-
-       for (split /\n/, LWP::UserAgent->new->request(HTTP::Request->new(GET => shift))->content) {
-               chomp;
-               if (m/^$/) {
-                       $NMU{$bug} = 1;
-                       $NMU{$bug, "source"} = $source;
-                       $NMU{$bug, "version"} = $version;
-#                      $comments{$bug} .= "[FIXED] Fixed package $source is in Incoming\n";
-                       $flag = 0;
-               } else {
-                       ($field, $value) = split(/: /, $_, 2);
-                       $bug = $value if($field =~ /bug/i);
-                       $source = $value if($field =~ /source/i);
-                       $version = $value if($field =~ /version/i);
-                       $flag = 1;
-               }
-       }
-       if ($flag) {
-               $NMU{$bug} = 1;
-               $NMU{$bug, "source"} = $source;
-               $NMU{$bug, "version"} = $version;
-#              $comments{$bug} .= "[FIXED] Fixed package $source in in Incoming\n";
-       }
-       close P;
-}
-
-
 sub urlsanit {
        my $url = shift;
        $url =~ s/%/%25/g;
@@ -376,12 +297,9 @@ sub htmlsanit {
 
 sub wwwnumber() {
        my $number = shift;             # Number of bug to html-ize
-#      my $section);                           # Section for the bug
 
        "<A HREF=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&amp;bug=" .
                urlsanit($number) . '">' . htmlsanit($number) . '</A>';
-#      ($section=$number) =~ s/([0-9]{2}).*/$1/;
-#      "<A HREF=\"${btsURL}/db/$section/$number.html\">$number</A>";
 }
 
 sub wwwname() {
@@ -389,14 +307,12 @@ sub wwwname() {
 
        "<A HREF=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=no&amp;pkg=" .
                urlsanit($name) . '">' . htmlsanit($name) . '</A>';
-#      "<A HREF=\"${btsURL}/db/pa/l$name.html\">$name</A>";
 }
 
 sub check_worry {
        my ($status) = @_;
 
        if ($status =~ m/^\[[^]]*I/ or
-           $status =~ m/ \[[^]]*X/ or
             $status !~ m/ \[[^]]*T/) {
                return 0;
        }