X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=make-britney-counts;h=e541426384d7f6a6c67849ecdf788b3a5ed839ee;hp=5eb3090d32f9250610fea20a3450e9d7858c6f56;hb=HEAD;hpb=e6e2bdf5bb1dd5b7e095a27af2d5247b659ca5da

diff --git a/make-britney-counts b/make-britney-counts
index 5eb3090..e541426 100755
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -4,8 +4,10 @@
 # Generate a report britney can use
 
 use Getopt::Std;
-require scanlib;
-require bugcfg;
+use File::Basename;
+use lib dirname(__FILE__);
+use bugcfg;
+use scanlib;
 use strict;
 # use warnings;
 
@@ -44,9 +46,11 @@ my %unstablebugs = ();
 while (my ($nr, $bug) = each %scanlib::bugs) {
 	for my $package (split /[,\s]+/, $bug->{'package'}) {
 		$package =~ y/A-Z/a-z/;
-		$package = $` if ($package =~ /[^-+._a-z0-9]/);
+		$package = $` if ($package =~ /[^-+._:a-z0-9]/);
 
-		if (scanlib::check_worry_unstable($bug)) {
+		# this hack is specific to britney counts, and ignores
+		# bugs tagged ignore for the next testing release
+		if (scanlib::check_worry_unstable($bug) and not $bug->{$bugcfg::debian_releases->{testing}.'-ignore'}) {
 			push @{$unstablebugs{$package}}, $nr;
 		}
 		if (scanlib::check_worry($bug)) {
@@ -63,8 +67,10 @@ for my $pkg (sort keys %testingbugs) {
 	print TESTING   "$pkg ", scalar @{$testingbugs{$pkg}}, "\n";
 	print TESTINGNR "$pkg ", join(',', @{$testingbugs{$pkg}}), "\n";
 }
-close TESTING;
-close TESTINGNR;
+close TESTING
+	or die "close britney/testing.new: $!";
+close TESTINGNR
+	or die "close britney/testing-nr.new: $!";
 
 open UNSTABLE, ">", "britney/unstable.new"
 	or die "britney/unstable.new: $!";
@@ -74,8 +80,10 @@ for my $pkg (sort keys %unstablebugs) {
 	print UNSTABLE   "$pkg ", scalar @{$unstablebugs{$pkg}}, "\n";
 	print UNSTABLENR "$pkg ", join(',', @{$unstablebugs{$pkg}}), "\n";
 }
-close UNSTABLE;
-close UNSTABLENR;
+close UNSTABLE
+	or die "close britney/unstable.new: $!";
+close UNSTABLENR
+	or die "close britney/unstable-nr.new: $!";
 
 rename "britney/testing.new", "britney/testing"
 	or die "renaming britney/testing.new to britney/testing: $!";