X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugreport;h=85c77168d2af8b44c48d5c0c0f523129fa4cc08f;hp=f6be50a60c198761dde79b126e90981cf1b43048;hb=2c3420fc4ec1ddb5e1cedc437d4d349517e1e1c8;hpb=e23f39acb49098e01f20a8e6fdc9f68d296b45ed diff --git a/bugreport b/bugreport index f6be50a..85c7716 100755 --- a/bugreport +++ b/bugreport @@ -45,13 +45,18 @@ sub PrintPackageHeader() { my ($name, $email); # Name & email of maintainer if ($html) { - print "
"; - print "Package: " . &wwwname($p); + print ""; + print "Package: " . scanlib::wwwname($p); print " ($scanlib::section{$p}).\n"; print "Maintainer: "; if (defined($scanlib::maintainer{$p})) { - $_ = $scanlib::maintainer{$p}; - ($name,$email) = m/(.*) <([^>]*)>/; + if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) { + ($name,$email) = ($1,$2); + } elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) { + ($name,$email) = ($1,$2); + } elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) { + $name = $email = $1; + } print "$name <$email>\n"; } else { print "unknown\n"; @@ -75,24 +80,16 @@ 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}; } - for $nr (sort split(/ /, $scanlib::packagelist{$p})) { + for $nr (sort @{$scanlib::packagelist{$p}}) { next if (defined $bugcfg::exclude{$nr}); if (! $header) { $header = 1; @@ -114,8 +111,8 @@ sub MakeBuglist() { print "" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/); print "" if $worry; ($sect=$nr) =~ s/([0-9]{2}).*/$1/; - print " " . &wwwnumber($nr) . ' ' . - htmlsanit($scanlib::bugs{$nr}) . "\n"; + print " " . scanlib::wwwnumber($nr) . ' ' . + scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n"; print "" if $worry; print "" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/); } else { @@ -126,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); } @@ -135,42 +131,34 @@ sub MakeBuglist() { sub MakeStatistics() { - my $bugcount; # Total number of bugs so far - my $count; # Number of bugs for this package - my $remtotal; # Total number of bugs for packages marked REMOVE - my $patchtotal; # Total number of bugs marked patch - my $pendingtotal; # Total number of bugs marked pending - my $ignoretotal; # Total number of bugs marked ignore - my $nottestingtotal; # Total number of bugs on packages not in testing - my $worrytotal; # Total number of bugs we're actually worried about - my $p; # Index variable + my $bugcount=0; # Total number of bugs so far + 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 + my $nottestingtotal=0; # Total number of bugs on packages not in testing + my $worrytotal=0; # Total number of bugs we're actually worried about my %list; # List of bugnumber associated with package - $bugcount=0; for my $p (sort keys %scanlib::packagelist) { + my $count = 0; # Number of bugs for this package + next if (defined $scanlib::exclude{$p}); - $count=0; - for my $nr (split(/ /, $scanlib::packagelist{$p})) { + for my $nr (@{$scanlib::packagelist{$p}}) { $pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/); $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); @@ -178,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); @@ -198,8 +185,8 @@ sub FilterPackages($) { sub FilterBugs() { for my $p (sort keys %scanlib::packagelist) { - $scanlib::packagelist{$p} = join(' ', grep { 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); } }