X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=40f293092d58c6b3de23aaef545130d58b15ac84;hp=d8d04671369170e199864544ebb1dd4b634521a4;hb=37c1a7189dec60183ce19b121afa2747f17dda68;hpb=b4b7d1e49f7fea5ba42243ea2dbf3026cd313cec

diff --git a/scanlib.pm b/scanlib.pm
index d8d0467..40f2930 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,6 +200,14 @@ sub scanspooldir() {
 
 				next if (!$disttags{$dist});
 
+				# This is needed for now
+				my $exists = 0;
+				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(
 					bug => $f, 
 					status => $bug, 
@@ -239,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;
 		}
 
@@ -288,37 +287,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;
@@ -353,7 +321,6 @@ sub check_worry {
 	my ($status) = @_;
 
 	if ($status =~ m/^\[[^]]*I/ or
-	    $status =~ m/ \[[^]]*X/ or
             $status !~ m/ \[[^]]*T/) {
 		return 0;
 	}