X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=65adb6312e18fff97c260f87f311071e49436452;hp=b5154a5860305e9d50e9851279c417d917a50bf5;hb=4ef8564c7e87c67015de727dbf9bd23a51f927d3;hpb=208048faabf59b200dbabe0ddfe34406d7c8fbd5

diff --git a/scanlib.pm b/scanlib.pm
index b5154a5..65adb63 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -11,7 +11,6 @@
 #   %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;
@@ -25,7 +24,7 @@ use warnings;
 require bugcfg;
 package scanlib;
 
-our (%premature,%exclude,%maintainer,%section,%packagelist,%NMU,%debbugssection,%bugs);
+our (%premature,%exclude,%maintainer,%section,%packagelist,%debbugssection,%bugs);
 
 
 # Read the list of maintainer 
@@ -201,11 +200,23 @@ sub scanspooldir() {
 
 				next if (!$disttags{$dist});
 
+				# 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;
+				}
+
+				next if !$exists;
+
 				my $presence = Debbugs::Status::bug_presence(
 					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
@@ -288,37 +299,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;
-			$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;
-	}
-	close P;
-}
-
-
 sub urlsanit {
 	my $url = shift;
 	$url =~ s/%/%25/g;
@@ -337,12 +317,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() {
@@ -350,7 +327,6 @@ 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 {