Date: Thu, 22 Mar 2007 20:10:11 +0000
Subject: [PATCH 05/16] "I" can stand for both sarge- and etch-ignore.
---
dohtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dohtml b/dohtml
index 1e9a6ab..66e03b1 100755
--- a/dohtml
+++ b/dohtml
@@ -51,7 +51,7 @@ tags:
R: unreproducible
S: security
U: upstream
- I: etch-ignore
+ I: sarge-ignore or etch-ignore
--
2.39.2
From 3924a03164fa1d9a292bf9627cce5d37ee9335f2 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Sat, 31 Mar 2007 13:46:05 +0000
Subject: [PATCH 06/16] Add a page listing only the bugs relevant for stable.
---
bugreport | 15 ++++++++++++---
dohtml | 3 +++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/bugreport b/bugreport
index 5c6b0c8..3b128fd 100755
--- a/bugreport
+++ b/bugreport
@@ -21,13 +21,14 @@ sub ShowVersion() {
sub ShowUsage() {
print <pseudo-packages
(?)
Everything in one page
+
+ + Only bugs relevant to stable
+ Only bugs relevant to testing
@@ -154,6 +156,7 @@ 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/stable.html" "$time" "-b"
makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
makemainpage > $htmldir/index.html.new
--
2.39.2
From 0a8a6839c3fbeb4a67a4e43704861c3af8b35214 Mon Sep 17 00:00:00 2001
From: Debian BTS
Date: Tue, 10 Apr 2007 11:20:32 +0000
Subject: [PATCH 07/16] Move stuff back into their original places.
---
crontab | 5 +----
dograph | 6 +++---
dohtml | 2 +-
dostatus | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/crontab b/crontab
index 06e93cc..40b9b59 100755
--- a/crontab
+++ b/crontab
@@ -2,7 +2,7 @@
set -e
-cd /home/sesse/bugscan
+cd /org/bugs.debian.org/bugscan
# Run script from doogie to check packages in Incoming
# ../../doogie/chgscan/update -o quiet=yes
@@ -30,6 +30,3 @@ ln -sf $countfile count
./dohtml
./dostatus
./dograph
-
-rsync -r www/ sesse@gluck.debian.org:public_html/bugscan/
-
diff --git a/dograph b/dograph
index a005901..00be2d3 100755
--- a/dograph
+++ b/dograph
@@ -2,7 +2,7 @@
set -e
-cd /home/sesse/bugscan
+cd /org/bugs.debian.org/bugscan
tmp=`tempfile`
tmp2=`tempfile`
@@ -31,9 +31,9 @@ set terminal png
set yrange [0:]
#set xtics 2678400
#set nomxtics
-set output "/home/sesse/bugscan/www/graph.png"
+set output "/org/bugs.debian.org/www/bugscan/graph.png"
plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
quit
EOF
-rm "$tmp" "$tmp2"
+rm "$tmp" "$tmp2" "$tmp3"
diff --git a/dohtml b/dohtml
index c86d56a..01ad370 100755
--- a/dohtml
+++ b/dohtml
@@ -1,6 +1,6 @@
#! /bin/sh
-htmldir=/home/sesse/bugscan/www
+htmldir=/org/bugs.debian.org/www/bugscan
realmakepage() {
local filter="$1" # Distributions to list
diff --git a/dostatus b/dostatus
index 563e2b5..4f2cf58 100755
--- a/dostatus
+++ b/dostatus
@@ -1,6 +1,6 @@
#!/bin/sh
newtime=`stat --format %y status | cut -d: -f-2`
-echo -n "$newtime (CST): " > /home/sesse/bugscan/www/status
+echo -n "$newtime (CST): " > /org/bugs.debian.org/www/bugscan/status
./bugreport -s >> /home/sesse/bugscan/www/status
--
2.39.2
From 02cc5bba35cc8b9c6ce76a2c1bc7b520187bcaa3 Mon Sep 17 00:00:00 2001
From: Debian BTS
Date: Tue, 10 Apr 2007 11:31:15 +0000
Subject: [PATCH 08/16] Etch is out! Switch to etch/lenny as current/next.
---
bugcounts | 2 +-
bugreport | 6 +++---
dohtml | 2 +-
dostatus | 3 ++-
scanlib.pm | 8 ++++----
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/bugcounts b/bugcounts
index b53527e..1a84994 100755
--- a/bugcounts
+++ b/bugcounts
@@ -49,7 +49,7 @@ for my $bug (values %scanlib::bugs) {
$total++;
$pendingcount++ if ($bug->{'pending'});
$patchcount++ if ($bug->{'patch'});
- $ignorecount++ if ($bug->{'sarge-ignore'} || $bug->{'etch-ignore'});
+ $ignorecount++ if ($bug->{'etch-ignore'} || $bug->{'lenny-ignore'});
$worrycount++ if (scanlib::check_worry($bug));
$stablecount++ if (scanlib::check_worry_stable($bug));
}
diff --git a/bugreport b/bugreport
index 3b128fd..79c325f 100755
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
} elsif ($scanlib::bugs{$nr}->{'help'}) {
print '';
}
- print "" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+ print "" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
print "" if $worry;
($sect=$nr) =~ s/([0-9]{2}).*/$1/;
printf " %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
@@ -111,7 +111,7 @@ sub MakeBuglist() {
scanlib::get_relinfo($scanlib::bugs{$nr}),
scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
print "" if $worry;
- print "" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+ print "" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
} else {
printf(" %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
@@ -142,7 +142,7 @@ sub MakeStatistics() {
for my $nr (@{$scanlib::packagelist{$p}}) {
$pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
$patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
- $ignoretotal++ if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+ $ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
$worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
$stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
diff --git a/dohtml b/dohtml
index 01ad370..bf6ad1b 100755
--- a/dohtml
+++ b/dohtml
@@ -51,7 +51,7 @@ tags:
R: unreproducible
S: security
U: upstream
- I: sarge-ignore or etch-ignore
+ I: etch-ignore or lenny-ignore
diff --git a/dostatus b/dostatus
index 4f2cf58..ad27f67 100755
--- a/dostatus
+++ b/dostatus
@@ -2,5 +2,6 @@
newtime=`stat --format %y status | cut -d: -f-2`
echo -n "$newtime (CST): " > /org/bugs.debian.org/www/bugscan/status
-./bugreport -s >> /home/sesse/bugscan/www/status
+./bugreport -s >> /org/bugs.debian.org/www/bugscan/status
+
diff --git a/scanlib.pm b/scanlib.pm
index 0f64165..4c76872 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -224,7 +224,7 @@ sub scanspooldir() {
next if !$affects_any;
}
- for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
+ for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
$bi->{$keyword} = grep(/^$keyword$/, @tags);
}
@@ -316,13 +316,13 @@ sub wwwname() {
sub check_worry {
my ($bi) = @_;
- return ($bi->{'testing'} && !$bi->{'etch-ignore'});
+ return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
}
sub check_worry_stable {
my ($bi) = @_;
- return ($bi->{'stable'} && !$bi->{'sarge-ignore'});
+ return ($bi->{'stable'} && !$bi->{'etch-ignore'});
}
sub get_taginfo {
@@ -336,7 +336,7 @@ sub get_taginfo {
$taginfo .= $bi->{'unreproducible'} ? "R" : " ";
$taginfo .= $bi->{'security'} ? "S" : " ";
$taginfo .= $bi->{'upstream'} ? "U" : " ";
- $taginfo .= ($bi->{'sarge-ignore'} || $bi->{'etch-ignore'}) ? "I" : " ";
+ $taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
return $taginfo;
}
--
2.39.2
From 2076316f9eac086043f75fad2729a58cc067cf08 Mon Sep 17 00:00:00 2001
From: Debian BTS
Date: Tue, 10 Apr 2007 11:33:13 +0000
Subject: [PATCH 09/16] More fixes for etch as stable.
---
dohtml | 2 +-
makepost | 2 +-
scanlib.pm | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dohtml b/dohtml
index bf6ad1b..ebdd716 100755
--- a/dohtml
+++ b/dohtml
@@ -56,7 +56,7 @@ tags:
The second set of tags indicate what releases a bug applies to:
-O for oldstable (woody), S for stable (sarge), T for testing (etch),
+O for oldstable (sarge), S for stable (etch), T for testing (lenny),
U for unstable (sid) or E for experimental.
diff --git a/makepost b/makepost
index 76b76d0..4d96cf4 100755
--- a/makepost
+++ b/makepost
@@ -23,7 +23,7 @@ Explanation for bug tags:
I etch-ignore
The second set of tags indicate what releases a bug applies to:
-O for oldstable (woody), S for stable (sarge), T for testing (etch),
+O for oldstable (sarge), S for stable (etch), T for testing (lenny),
U for unstable (sid) or E for experimental.
------------------------------------------------------------------------------
diff --git a/scanlib.pm b/scanlib.pm
index 4c76872..4ef4191 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -174,9 +174,9 @@ sub scanspooldir() {
next if $skip==1;
my %disttags = ();
- $disttags{'oldstable'} = grep(/^woody$/, @tags);
- $disttags{'stable'} = grep(/^sarge$/, @tags);
- $disttags{'testing'} = grep(/^etch$/, @tags);
+ $disttags{'oldstable'} = grep(/^sarge$/, @tags);
+ $disttags{'stable'} = grep(/^etch$/, @tags);
+ $disttags{'testing'} = grep(/^lenny$/, @tags);
$disttags{'unstable'} = grep(/^sid$/, @tags);
$disttags{'experimental'} = grep(/^experimental$/, @tags);
--
2.39.2
From 8029d6736c0559ee3facd84bf7266deab306dfbf Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Sun, 17 Jun 2007 15:58:21 +0000
Subject: [PATCH 10/16] Changed the default suite tags, after Debconf 7
discussion.
---
scanlib.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scanlib.pm b/scanlib.pm
index 0f64165..a9b4a04 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -180,8 +180,9 @@ sub scanspooldir() {
$disttags{'unstable'} = grep(/^sid$/, @tags);
$disttags{'experimental'} = grep(/^experimental$/, @tags);
- # default according to dondelelcaro 2006-11-11
+ # default according to vorlon 2007-06-17
if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+ $disttags{'stable'} = 1;
$disttags{'testing'} = 1;
$disttags{'unstable'} = 1;
$disttags{'experimental'} = 1;
--
2.39.2
From 5e9977948a37d9ff7ae73479a72b2b2e01c19b16 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Mon, 18 Jun 2007 13:00:49 +0000
Subject: [PATCH 11/16] Output testing/unstable counts britney can use.
---
make-britney-counts | 73 +++++++++++++++++++++++++++++++++++++++++++++
scanlib.pm | 7 +++++
2 files changed, 80 insertions(+)
create mode 100755 make-britney-counts
diff --git a/make-britney-counts b/make-britney-counts
new file mode 100755
index 0000000..9a78432
--- /dev/null
+++ b/make-britney-counts
@@ -0,0 +1,73 @@
+#!/usr/bin/perl
+# vim: ts=8 sw=8 nowrap
+
+# Generate a report britney can use
+
+use Getopt::Std;
+require scanlib;
+require bugcfg;
+use strict;
+# use warnings;
+
+my $Version = "make-britney-count 1.0\nCopyright (C) Steinar H. Gunderson \n";
+my $statusfile = "status";
+
+sub ShowVersion() {
+ print "$Version\n";
+ exit 0;
+}
+
+sub ShowUsage() {
+ print <{'package'}) {
+ $package =~ y/A-Z/a-z/;
+ $package = $` if ($package =~ /[^-+._a-z0-9]/);
+
+ if (scanlib::check_worry_unstable($bug)) {
+ ++$unstablebugs{$package};
+ }
+ if (scanlib::check_worry($bug)) {
+ ++$testingbugs{$package};
+ }
+ }
+}
+
+open TESTING, ">", "britney/testing"
+ or die "britney/testing: $!";
+for my $pkg (sort keys %testingbugs) {
+ print TESTING "$pkg $testingbugs{$pkg}\n";
+}
+close TESTING;
+
+open UNSTABLE, ">", "britney/unstable"
+ or die "britney/unstable: $!";
+for my $pkg (sort keys %unstablebugs) {
+ print UNSTABLE "$pkg $unstablebugs{$pkg}\n";
+}
+close UNSTABLE;
+
+exit 0;
+
diff --git a/scanlib.pm b/scanlib.pm
index 9bd8458..50a6951 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -83,6 +83,7 @@ sub readpackages() {
next unless m/^Package:\s/; # We're only interested in the packagenames
s/^Package:\s*//; # Strip the fieldname
$section{$_} = "$archive/$sect";
+ print "$root/$sect/binary-$arch/Packages.gz\n" if ($_ eq 'xtla');
}
close(P);
}
@@ -326,6 +327,12 @@ sub check_worry_stable {
return ($bi->{'stable'} && !$bi->{'etch-ignore'});
}
+sub check_worry_unstable {
+ my ($bi) = @_;
+
+ return ($bi->{'unstable'});
+}
+
sub get_taginfo {
my $bi = shift;
--
2.39.2
From 65552ea81d2575fa110d151b5a693b92b8921eee Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Mon, 18 Jun 2007 13:03:19 +0000
Subject: [PATCH 12/16] Add make-britney-counts to the crontab.
---
crontab | 1 +
1 file changed, 1 insertion(+)
diff --git a/crontab b/crontab
index 40b9b59..209a38f 100755
--- a/crontab
+++ b/crontab
@@ -30,3 +30,4 @@ ln -sf $countfile count
./dohtml
./dostatus
./dograph
+./make-britney-counts
--
2.39.2
From affc57cced8db2537cc22ad5f4ed4ed00e7714df Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Mon, 18 Jun 2007 14:14:30 +0000
Subject: [PATCH 13/16] Make the britney count files more-or-less atomically
updated.
---
make-britney-counts | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/make-britney-counts b/make-britney-counts
index 9a78432..648ec2f 100755
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -55,19 +55,24 @@ for my $bug (values %scanlib::bugs) {
}
}
-open TESTING, ">", "britney/testing"
- or die "britney/testing: $!";
+open TESTING, ">", "britney/testing.new"
+ or die "britney/testing.new: $!";
for my $pkg (sort keys %testingbugs) {
print TESTING "$pkg $testingbugs{$pkg}\n";
}
close TESTING;
-open UNSTABLE, ">", "britney/unstable"
- or die "britney/unstable: $!";
+open UNSTABLE, ">", "britney/unstable.new"
+ or die "britney/unstable.new: $!";
for my $pkg (sort keys %unstablebugs) {
print UNSTABLE "$pkg $unstablebugs{$pkg}\n";
}
close UNSTABLE;
+rename "britney/testing.new", "britney/testing"
+ or die "renaming britney/testing.new to britney/testing: $!";
+rename "britney/unstable.new", "britney/unstable"
+ or die "renaming britney/unstable.new to britney/unstable: $!";
+
exit 0;
--
2.39.2
From e6e2bdf5bb1dd5b7e095a27af2d5247b659ca5da Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Mon, 18 Jun 2007 19:25:11 +0000
Subject: [PATCH 14/16] Also add bug number lists, per aba's request.
---
make-britney-counts | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/make-britney-counts b/make-britney-counts
index 648ec2f..5eb3090 100755
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -41,38 +41,50 @@ scanlib::readstatus($statusfile);
my %testingbugs = ();
my %unstablebugs = ();
-for my $bug (values %scanlib::bugs) {
+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]/);
if (scanlib::check_worry_unstable($bug)) {
- ++$unstablebugs{$package};
+ push @{$unstablebugs{$package}}, $nr;
}
if (scanlib::check_worry($bug)) {
- ++$testingbugs{$package};
+ push @{$testingbugs{$package}}, $nr;
}
}
}
open TESTING, ">", "britney/testing.new"
or die "britney/testing.new: $!";
+open TESTINGNR, ">", "britney/testing-nr.new"
+ or die "britney/testing-nr.new: $!";
for my $pkg (sort keys %testingbugs) {
- print TESTING "$pkg $testingbugs{$pkg}\n";
+ print TESTING "$pkg ", scalar @{$testingbugs{$pkg}}, "\n";
+ print TESTINGNR "$pkg ", join(',', @{$testingbugs{$pkg}}), "\n";
}
close TESTING;
+close TESTINGNR;
open UNSTABLE, ">", "britney/unstable.new"
or die "britney/unstable.new: $!";
+open UNSTABLENR, ">", "britney/unstable-nr.new"
+ or die "britney/unstable-nr.new: $!";
for my $pkg (sort keys %unstablebugs) {
- print UNSTABLE "$pkg $unstablebugs{$pkg}\n";
+ print UNSTABLE "$pkg ", scalar @{$unstablebugs{$pkg}}, "\n";
+ print UNSTABLENR "$pkg ", join(',', @{$unstablebugs{$pkg}}), "\n";
}
close UNSTABLE;
+close UNSTABLENR;
rename "britney/testing.new", "britney/testing"
or die "renaming britney/testing.new to britney/testing: $!";
+rename "britney/testing-nr.new", "britney/testing-nr"
+ or die "renaming britney/testing-nr.new to britney/testing-nr: $!";
rename "britney/unstable.new", "britney/unstable"
or die "renaming britney/unstable.new to britney/unstable: $!";
+rename "britney/unstable-nr.new", "britney/unstable-nr"
+ or die "renaming britney/unstable-nr.new to britney/unstable-nr: $!";
exit 0;
--
2.39.2
From db439f4044efdec3b5383b20fb0799c2582099dc Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson"
Date: Tue, 19 Jun 2007 22:27:39 +0000
Subject: [PATCH 15/16] Give "source" as architecture for bug_presence(), in
order to also detect bugs that are filed against source packages that are not
also binary packages.
---
scanlib.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scanlib.pm b/scanlib.pm
index 50a6951..7451d88 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -142,6 +142,8 @@ sub scanspooldir() {
my $skip; # Flow control
my $walk; # index variable
my $taginfo; # Tag info
+
+ my @archs_with_source = ( @bugcfg::architectures, 'source' );
chdir($dir) or die "chdir $dir: $!\n";
@@ -210,7 +212,7 @@ sub scanspooldir() {
bug => $f,
status => $bug,
dist => $dist,
- arch => \@bugcfg::architectures
+ arch => \@archs_with_source
);
# ignore bugs that are absent/fixed in this distribution, include everything
--
2.39.2
From 5cede63b9e4f5fa050d6879d8f77049f201d54f7 Mon Sep 17 00:00:00 2001
From: Don Armstrong
Date: Fri, 26 Sep 2008 13:34:15 -0700
Subject: [PATCH 16/16] * specifically ignore bugs tagged lenny-ignore for the
purposes of making britney counts
---
make-britney-counts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/make-britney-counts b/make-britney-counts
index 5eb3090..9e5c165 100755
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -46,7 +46,9 @@ while (my ($nr, $bug) = each %scanlib::bugs) {
$package =~ y/A-Z/a-z/;
$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->{'lenny-ignore'}) {
push @{$unstablebugs{$package}}, $nr;
}
if (scanlib::check_worry($bug)) {
--
2.39.2