X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=37931f7f0358e89ab49ca72b1f4a7e58158367b6;hp=83e4b601fca414f90847e42e6fe3396174129ba3;hb=79a7d8380b9712a363a95e8998d6ba3e95ff581b;hpb=849c4e5e737c1c66e5bcfcd108278457cd83f88d

diff --git a/scanlib.pm b/scanlib.pm
index 83e4b60..37931f7 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -6,7 +6,6 @@
 # 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
@@ -26,43 +25,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,%NMU,%debbugssection,%bugs);
 
 
 # Read the list of maintainer 
@@ -215,23 +178,23 @@ sub scanspooldir() {
 		$disttags{'testing'}      = grep(/^etch$/, @tags);
 		$disttags{'unstable'}     = grep(/^sid$/, @tags);
 		$disttags{'experimental'} = grep(/^experimental$/, @tags);
+			
+		# default according to dondelelcaro 2006-11-11
+		if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+			$disttags{'testing'} = 1;
+			$disttags{'unstable'} = 1;
+			$disttags{'experimental'} = 1;
+		}
 		
 		my $relinfo = "";
-		warn $section{$bug->{'package'}};
-		if ($section{$bug->{'package'}} eq 'pseudo') {
+		if (defined($section{$bug->{'package'}}) && $section{$bug->{'package'}} eq 'pseudo') {
 			# versioning information makes no sense for pseudo packages,
 			# just use the tags
 			for my $dist qw(oldstable stable testing unstable experimental) {
 				$relinfo .= uc(substr($dist, 0, 1)) if $disttags{$dist};
 			}
+			next if (length($bug->{'done'}));
 		} else {
-			# default according to dondelelcaro 2006-11-11
-			if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
-				$disttags{'testing'} = 1;
-				$disttags{'unstable'} = 1;
-				$disttags{'experimental'} = 1;
-			}
-
 			# only bother to check the versioning status for the distributions indicated by the tags 
 			for my $dist qw(oldstable stable testing unstable experimental) {
 				local $SIG{__WARN__} = sub {};
@@ -242,7 +205,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
@@ -338,7 +301,6 @@ sub readNMUstatus() {
 			$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);
@@ -352,7 +314,6 @@ sub readNMUstatus() {
 		$NMU{$bug} = 1;
 		$NMU{$bug, "source"} = $source;
 		$NMU{$bug, "version"} = $version;
-#		$comments{$bug} .= "[FIXED] Fixed package $source in in Incoming\n";
 	}
 	close P;
 }
@@ -397,7 +358,7 @@ sub check_worry {
 
 	if ($status =~ m/^\[[^]]*I/ or
 	    $status =~ m/ \[[^]]*X/ or
-            ($status =~ m/ \[[^]]*[OSUE]/ and $status !~ m/ \[[^]]*T/)) {
+            $status !~ m/ \[[^]]*T/) {
 		return 0;
 	}
 	return 1;