There's no need for %packagelist to be a space-delimited list of bug

numbers. Make it a proper array instead, and clean up some brain damage
related to it. This also fixes warnings.

diff --git a/bugcounts b/bugcounts
index cf8809630e0fc77fa3bb4a31ae34bf297a90a58f..f3913ee91b851e60819fd5f6e2c2072c177946bb 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -53,7 +53,7 @@ my %sectcount=();     # Bugs per type
 
 for my $p (keys %scanlib::packagelist) {
        next if (defined $bugcfg::exclude{$p});
-       for my $nr (sort split(/ /, $scanlib::packagelist{$p})) {
+       for my $nr (sort @{$scanlib::packagelist{$p}}) {
                next if (defined $bugcfg::exclude{$nr});
                $total++;
                $pendingcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
@@ -73,8 +73,7 @@ for my $p (keys %scanlib::packagelist) {
        }
 
        if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
-               my @a = split(/ /,$scanlib::packagelist{$p});
-               $removecount += scalar(@a);
+               $removecount += scalar @{$scanlib::packagelist{$p});
        }
 }
 

diff --git a/bugdiff b/bugdiff
index 33cc562fe6e8ae317b731362382336982730429c..787371915a215cc4088335298387b2d83ddfaba7 100755 (executable)
--- a/bugdiff
+++ b/bugdiff
@@ -103,8 +103,8 @@ scanlib::readstatus($ARGV[1]);
 
 $closed=0;
 for $p (keys %oldbugs) {
-       for $b (split(/ /, $oldbugs{$p})) {
-               if (not ($packagelist{$p} =~ m/\b$b\b/)) {
+       for $b (@{$oldbugs{$p}}) {
+               if (scalar grep { $_ == $b } @{$packagelist{$p}} == 0) { 
                        $removed{$p} .= "$b ";
                        $closed++;
                }
@@ -113,7 +113,7 @@ for $p (keys %oldbugs) {
 
 $opened=0;
 for $p (keys %packagelist) {
-       for $b (split(/ /, $packagelist{$p})) {
+       for $b (@{$packagelist{$p}}) {
                if (not ($oldbugs{$p} =~ m/\b$b\b/)) {
                        $new{$p} .= "$b ";
                        $opened++;

diff --git a/bugreport b/bugreport
index 566e3a7a4e36a8d8fdbf5598b7821bbd49c15ff3..f9654bbd03aefb2e94070aa96737de20ac731c18 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -82,7 +82,7 @@ sub MakeBuglist() {
        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) {
+       for my $p (sort {$a->[0] <=> $b->[0]} keys %scanlib::packagelist) {
                next if (defined $bugcfg::exclude{$p});
                $header = 0;
                $fontset = 0;
@@ -97,135 +97,3 @@ sub MakeBuglist() {
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};
                }
-               for $nr (sort split(/ /, $scanlib::packagelist{$p})) {
-                       next if (defined $bugcfg::exclude{$nr});
-                       if (! $header) {
-                               $header = 1;
-                               &PrintPackageHeader($p);
-                       }
-
-                       if ($html) {
-                               my $worry = scanlib::check_worry($scanlib::bugs{$nr});
-                       
-                               if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/) {
-                                       print '<span style="color: #808080">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/) {
-                                       print '<span style="color: #f040d0">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/) {
-                                       print '<span style="color: #00aa00">';
-                               } elsif ($scanlib::bugs{$nr} =~ m/^\[[^]]*H/) {
-                                       print '<span style="color: #ffaa30">';
-                               }
-                               print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
-                               print "<em class=\"worry\">" if $worry;
-                               ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
-                               print "<A NAME=\"$nr\"></A>  " . scanlib::wwwnumber($nr) . ' ' .
-                                         scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n";
-                               print "</em>" if $worry;
-                               print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
-                       } else {
-                               printf("  %-6d %s\n", $nr, $scanlib::bugs{$nr});
-                       }
-                       print $scanlib::comments{$nr} if (defined($scanlib::comments{$nr}));
-                       print "[FIX] Fixed by package " . $scanlib::NMU{$nr, "source"} . ", version " . $scanlib::NMU{$nr, "version"} . " in Incoming\n" if (defined $scanlib::NMU{$nr});
-                       print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
-                                                     $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
-               }
-               print "</span>" if ($fontset);
-               if ($header) {
-                       &PrintPackageFooter($p);
-               }
-       }
-}
-
-
-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
-       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
-
-       for my $p (sort keys %scanlib::packagelist) {
-               my $count = 0;          # Number of bugs for this package
-
-               next if (defined $scanlib::exclude{$p});
-               for my $nr (split(/ /, $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/));
-
-                       if (not defined($scanlib::exclude{$nr})) {
-                               $bugcount++;
-                               $count++;
-                       } 
-               }
-               $remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);
-       }
-
-       if ($html) {
-               print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
-               printf("<strong>Number that will disappear after removing packages marked [REMOVE]:</strong> %d<BR>\n", $remtotal);
-               printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
-               printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
-               printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);
-               printf("<strong>Number on packages not in testing:</strong> %d<BR>\n", $nottestingtotal);
-               printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\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);
-               printf("Number on packages not in testing: %d\n", $nottestingtotal);
-               printf("Number concerning the next release (excluding ignored and not-in-testing): %d\n", $worrytotal);
-       }
-}
-
-
-sub FilterPackages($) {
-       my $filter = shift;             # Distribution we want to keep
-
-       for my $p (sort keys %scanlib::packagelist) {
-               delete $scanlib::packagelist{$p} unless ($scanlib::section{$p} =~ m/^$filter/);
-       }
-}
-
-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 '');
-       }
-}
-
-our ($opt_h,$opt_V,$opt_S,$opt_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l);
-
-getopts('VhHlstd:S:C:');
-ShowUsage if ($opt_h);
-ShowVersion if ($opt_V);
-$statusfile=$opt_S if ($opt_S);
-$commentsfile=$opt_C if ($opt_C);
-$html=1 if ($opt_H);
-
-scanlib::readstatus($statusfile);
-scanlib::readcomments($commentsfile);
-# scanlib::readNMUstatus($NMUfile);
-
-FilterPackages($opt_d) if ($opt_d);
-FilterBugs() if ($opt_t);
-
-MakeStatistics if ($opt_s);
-if ($opt_l) {
-       MakeBuglist();
-}
-
-exit 0;
-

diff --git a/bugscan b/bugscan
index 5a297737149f3ff80c6f7694515c0b1fe0833650..c78573f1576eddfc4f20733197cbd438c298c925 100755 (executable)
--- a/bugscan
+++ b/bugscan
@@ -27,10 +27,11 @@ for my $p (keys %scanlib::packagelist) {
        } else {
            $section = $scanlib::debbugssection{$p};
        }
-       print "$p $section $scanlib::maintainer{$p}";
-       for my $b (split(/ /, $scanlib::packagelist{$p})) {
+       print "$p $section $scanlib::maintainer{$p}\n";
+       for my $b (@{$scanlib::packagelist{$p}}) {
                print "$scanlib::bugs{$b}\n";
        }
+       print "\n";
 }
 
 exit 0;

diff --git a/cleancomments b/cleancomments
index b62e8ed4144f45bb9f633b42a5bff526d61dae0a..7b9f2897425b59a619afa716d1c2c55bfdf9eeb4 100755 (executable)
--- a/cleancomments
+++ b/cleancomments
@@ -41,7 +41,7 @@ $commentfile=$opt_C if ($opt_C);
 &readcomments($commentfile);
 
 for $p (keys %packagelist) {
-       for $nr (split(/ /, $packagelist{$p})) {
+       for my $nr (@{$packagelist{$p}}) {
                $found{$nr}=1;
        }
 }

diff --git a/scanlib.pm b/scanlib.pm
index f7b4bd1199e5a4dc64b75ecba95bac99913fe9c8..2b905c43996d3991c1710e09e1569c5d03757c38 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -265,7 +265,7 @@ sub scanspooldir() {
                                }
                        }
 
-                       $packagelist{$_} .= " $f";
+                       push @{$packagelist{$_}}, $f;
                }
 
                if ($relinfo eq "") { # or $relinfo eq "U" # confuses e.g. #210306
@@ -294,7 +294,7 @@ sub readstatus() {
                if (m/^[0-9]+ \[/) {
                        ($bug,$subject)=split(/ /, $_, 2);
                        $bugs{$bug}=$subject;
-                       $packagelist{$pkg} .= "$bug ";
+                       push @{$packagelist{$pkg}}, $bug;
                } else {
                        ($pkg,$sect, $mnt)=split(/ /, $_, 3);
                        $section{$pkg}=$sect;