X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=85c77168d2af8b44c48d5c0c0f523129fa4cc08f;hp=c528495147989e7446d781ba83ad8451e12d2377;hb=d58d0b081c8bc059a905f7eb9c7dd6c38cd8e2ca;hpb=debbe8bbf0dfbd8264ae94b07fab46b02a16f54e
diff --git a/bugreport b/bugreport
index c528495..85c7716 100755
--- a/bugreport
+++ b/bugreport
@@ -80,19 +80,11 @@ sub MakeBuglist() {
my $nr; # Current bugnumber
my $sect; # BTS-subsection for bugnumber
my $header; # Flag if packagename has already been printed
- my $fontset; # Did we change the font?
for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
next if (defined $bugcfg::exclude{$p});
$header = 0;
- $fontset = 0;
if (defined $scanlib::comments{$p}) {
- if ($html && defined($scanlib::comments{$p})) {
- if ($scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
- $fontset=1;
- print "";
- }
- }
$header=1;
&PrintPackageHeader($p);
print $scanlib::comments{$p};
@@ -131,7 +123,6 @@ sub MakeBuglist() {
print "" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
$scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
}
- print "" if ($fontset);
if ($header) {
&PrintPackageFooter($p);
}
@@ -141,7 +132,6 @@ sub MakeBuglist() {
sub MakeStatistics() {
my $bugcount=0; # Total number of bugs so far
- my $remtotal=0; # Total number of bugs for packages marked REMOVE
my $patchtotal=0; # Total number of bugs marked patch
my $pendingtotal=0; # Total number of bugs marked pending
my $ignoretotal=0; # Total number of bugs marked ignore
@@ -158,22 +148,17 @@ sub MakeStatistics() {
$patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
$ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
$nottestingtotal++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/);
- $worrytotal++ unless (
- $scanlib::bugs{$nr} =~ m/^\[[^]]*I/ or
- $scanlib::bugs{$nr} =~ m/ \[[^]]*X/ or
- ($scanlib::bugs{$nr} =~ m/ \[[^]]*[OSUE]/ and $scanlib::bugs{$nr} !~ m/ \[[^]]*T/));
+ $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
if (not defined($scanlib::exclude{$nr})) {
$bugcount++;
$count++;
}
}
- $remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);
}
if ($html) {
print "Total number of release-critical bugs: $bugcount
\n";
- printf("Number that will disappear after removing packages marked [REMOVE]: %d
\n", $remtotal);
printf("Number that have a patch: %d
\n", $patchtotal);
printf("Number that have a fix prepared and waiting to upload: %d
\n", $pendingtotal);
printf("Number that are being ignored: %d
\n", $ignoretotal);
@@ -181,7 +166,6 @@ sub MakeStatistics() {
printf("Number concerning the next release (excluding ignored and not-in-testing): %d
\n", $worrytotal); } else { print "Total number of release-critical bugs: $bugcount\n"; - printf("Number that will disappear after removing packages marked [REMOVE]: %d\n", $remtotal); printf("Number that have a patch: %d\n", $patchtotal); printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal); printf("Number that are being ignored: %d\n", $ignoretotal); @@ -201,8 +185,8 @@ sub FilterPackages($) { sub FilterBugs() { for my $p (sort keys %scanlib::packagelist) { - $scanlib::packagelist{$p} = join(' ', grep { scanlib::check_worry($scanlib::bugs{$_}) } split / /, $scanlib::packagelist{$p}); - delete $scanlib::packagelist{$p} if ($scanlib::packagelist{$p} eq ''); + $scanlib::packagelist{$p} = [ grep { scanlib::check_worry($scanlib::bugs{$_}) } @{$scanlib::packagelist{$p}} ]; + delete $scanlib::packagelist{$p} if (scalar @{$scanlib::packagelist{$p}} == 0); } }