From 208048faabf59b200dbabe0ddfe34406d7c8fbd5 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 10 Mar 2007 15:27:29 +0000 Subject: [PATCH] Weed out more traces of the comment system, and restore nvi brokenness. --- bugcounts | 13 ++--------- bugreport | 14 ++---------- cleancomments | 60 ------------------------------------------------- dohtml | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ scanlib.pm | 41 +--------------------------------- 5 files changed, 67 insertions(+), 123 deletions(-) delete mode 100755 cleancomments diff --git a/bugcounts b/bugcounts index 1920a5b..4c22005 100755 --- a/bugcounts +++ b/bugcounts @@ -11,7 +11,6 @@ use warnings; my $Version = "BugCount 1.1\nCopyright (C) Wichert Akkerman \n"; my $statusfile = "status"; -my $commentsfile = "comments"; sub ShowVersion() { print "$Version\n"; @@ -26,21 +25,18 @@ Options: -V show version -h show some (hopefully) helpfull information -S use different statusfile - -C use different commentsfile EOF exit 0; } -our ($opt_h,$opt_V,$opt_S,$opt_C); +our ($opt_h,$opt_V,$opt_S); -getopts('VhS:C:'); +getopts('VhS:'); ShowUsage if ($opt_h); ShowVersion if ($opt_V); $statusfile=$opt_S if ($opt_S); -$commentsfile=$opt_C if ($opt_C); scanlib::readstatus($statusfile); -scanlib::readcomments($commentsfile); my $total=0; # total number of bugs my $patchcount=0; # Number of bugs that have a fix proposed @@ -48,7 +44,6 @@ my $pendingcount=0; # Number of bugs that will have a fix uploaded RSN my $ignorecount=0; # Number of bugs being ignored my $nottestingcount=0; # Number of bugs on packages not in testing my $worrycount=0; # Number of bugs we're actually worried about -my %sectcount=(); # Bugs per type for my $p (keys %scanlib::packagelist) { next if (defined $bugcfg::exclude{$p}); @@ -59,10 +54,6 @@ for my $p (keys %scanlib::packagelist) { $patchcount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/); $ignorecount++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/); $nottestingcount++ if ($scanlib::bugs{$nr} =~ m/ \[[^]]*X/); - if (defined $scanlib::comments{$nr}) { - my $sect = ($scanlib::comments{$nr} =~ m/\[([^]]*)\]/); - $sectcount{$sect}++; - } $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr})); } } diff --git a/bugreport b/bugreport index 85c7716..63f8874 100755 --- a/bugreport +++ b/bugreport @@ -12,7 +12,6 @@ use warnings; my $Version = "BugReport 1.4\nCopyright (C) 1998-2002 Wichert Akkerman \n"; my $html = 0; my $statusfile = "status"; -my $commentsfile = "comments"; my $NMUfile = "/debian/home/doogie/public_html/incoming/bugs_closed"; $NMUfile = "/debian/home/doogie/chgscan/db/bugs_closed"; # Changed as of request by dark -Joey, 99/11/22 $NMUfile = "http://auric.debian.org/~doogie/incoming/bugs_closed"; # Changed as of request by dark -Joey, 99/11/22 @@ -35,7 +34,6 @@ Options: -t show bugs relevant for testing only -d only list these distributions (comma-separated) -S use different statusfile - -C use different commentsfile EOF exit 0; } @@ -84,11 +82,6 @@ sub MakeBuglist() { for my $p (sort {$a cmp $b} keys %scanlib::packagelist) { next if (defined $bugcfg::exclude{$p}); $header = 0; - if (defined $scanlib::comments{$p}) { - $header=1; - &PrintPackageHeader($p); - print $scanlib::comments{$p}; - } for $nr (sort @{$scanlib::packagelist{$p}}) { next if (defined $bugcfg::exclude{$nr}); if (! $header) { @@ -118,7 +111,6 @@ sub MakeBuglist() { } 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 "" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ || $scanlib::bugs{$nr} =~ m/ \[[^]]*X/)); @@ -190,17 +182,15 @@ sub FilterBugs() { } } -our ($opt_h,$opt_V,$opt_S,$opt_C,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l); +our ($opt_h,$opt_V,$opt_S,$opt_H,$opt_d,$opt_t,$opt_s,$opt_l); -getopts('VhHlstd:S:C:'); +getopts('VhHlstd:S:'); 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); diff --git a/cleancomments b/cleancomments deleted file mode 100755 index 7b9f289..0000000 --- a/cleancomments +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/perl -# vim: ts=4 sw=4 nowrap - -# Read a comments-file and output only the comments that are still relevant - -use Getopt::Std; -require scanlib; -require bugcfg; - -$Version = "CommentClean 1.0\nCopyright (C) Wichert Akkerman \n"; -$html = 0; -$statusfile = "status"; -$commentfile = "comments"; - -sub ShowVersion() { - print "$Version\n"; - exit 0; -} - -sub ShowUsage() { - print <
Graph of RC bugs
+ +

The red line graphs all bugs with release-critical severities; the green +line graphs the number of bugs that are actually a concern for the next +release (excluding ignored bugs, bugs on packages not in testing, and bugs +whose tags and/or versioning information indicate that they don't apply to +testing).

+ +

Recent changes

+EOF + + ./bugdiff -Hncs status-old status + + cat <Detailed lists of RC bug reports: + + +

+

+This page is automatically generated.
+Please contact +owner@bugs.debian.org for comments. +To receive all mails sent to release-critical bugs, subscribe to the +debian-bugs-rc +mailing list. + +EOF +} + +makepage() { + if [ ! -d "`dirname $3`" ]; then mkdir -p "`dirname $3`"; fi + realmakepage "$1" "$2" "$4" "$5" > $3.new + mv -f $3.new $3 +} + +time=$(date -u --date="$(ls -Ll status | awk '{print $6, $7}'):00 $(date +%z)") +oldtime=$(date -u --date="$(ls -Ll status-old | awk '{print $6, $7}'):00 $(date +%z)") +title="Release-critical bugs status" + +makepage "debian" "$title" "$htmldir/debian/all.html" "$time" +makepage "debian/main" "$title" $htmldir/debian/main.html "$time" +makepage "debian/contrib" "$title" $htmldir/debian/contrib.html "$time" +makepage "debian/non-free" "$title" $htmldir/debian/non-free.html "$time" +makepage "debian/source" "$title" $htmldir/debian/source.html "$time" + +makepage "" "$title" $htmldir/other/all.html "$time" +makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t" + +makemainpage > $htmldir/index.html.new +mv -f $htmldir/index.html.new $htmldir/index.html + diff --git a/scanlib.pm b/scanlib.pm index b1bd14c..b5154a5 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 () { - 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 @@ -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; } -- 2.39.2