Determine releases automatically from Debbugs::Config

Replace all hard coded release aliases everywhere except for dohtml

diff --git a/bugcfg.pm b/bugcfg.pm
index 9293e0d8d4273f2cf2612e2ea9df49c73b24e894..d23df59bd7c8c7422cb591d33a49b99db985e971 100644 (file)
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -16,10 +16,19 @@ $debian_ftproot = $config{package_source};
 $debian_sources = $config{package_source};
 $pseudolist = $config{pseudo_desc_file};
 
 $debian_sources = $config{package_source};
 $pseudolist = $config{pseudo_desc_file};
 

-$debian_sources        = "/etc/debbugs/indices/ftp.sources";
-
-$debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-
+# this is just the default, and should always be overriden by the
+# Debbugs::Config; set values
+our $debian_releases = {testing => 'jessie',
+                        stable  => 'wheezy',
+                        unstable => 'sid',
+                        oldstable => 'squeeze',
+                       };
+# figure out debian releases from distribution aliases
+for my $alias (keys %{$config{distribution_aliases}//{}}) {
+    next if $alias eq $config{distribution_aliases}{$alias};
+    $debian_releases->{$config{distribution_aliases}{$alias}} =
+        $alias;
+}

 
 # check out:
 # http://release.debian.org/wheezy/arch_qualify.html
 
 # check out:
 # http://release.debian.org/wheezy/arch_qualify.html

diff --git a/bugcounts b/bugcounts
index 1d5fb25e14893b250b1441a0e409fdd88c41342c..15455ab6e8f9bb9399da0e9bc971a234b0056f1a 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -49,7 +49,8 @@ for my $bug (values %scanlib::bugs) {
        $total++;
        $pendingcount++ if ($bug->{'pending'});
        $patchcount++ if ($bug->{'patch'});
        $total++;
        $pendingcount++ if ($bug->{'pending'});
        $patchcount++ if ($bug->{'patch'});

-       $ignorecount++ if ($bug->{'wheezy-ignore'} || $bug->{'jessie-ignore'});
+       $ignorecount++ if ($bug->{$debian_releases->{stable}.'-ignore'} ||
+                       $bug->{$debian_releases->{testing}.'-ignore'});

        $worrycount++ if (scanlib::check_worry($bug));
        $stablecount++ if (scanlib::check_worry_stable($bug));
 }
        $worrycount++ if (scanlib::check_worry($bug));
        $stablecount++ if (scanlib::check_worry_stable($bug));
 }

diff --git a/bugreport b/bugreport
index c85f0e627eb44ae65796f770d629ef7cd39e6280..ff1b0c77c0cfc40ca966b43dc589b9b9e166f6fb 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }

-                               print "<strike>" if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'jessie-ignore'});
+                               print "<strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});

                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
                                printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
                                printf "<A NAME=\"$nr\"></A>  %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 "</em>" if $worry;
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), 
                                        scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
                                print "</em>" if $worry;

-                               print "</strike>" if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'jessie-ignore'});
+                               print "</strike>" if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-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'});
                        } else {
                                printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});


@@ -146,7 +146,7 @@ sub MakeStatistics() {
                     $seen_bugs{$nr} = 1;
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
                     $seen_bugs{$nr} = 1;
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});

-                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'jessie-ignore'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{$bugcfg::debian_releases->{stable}.'-ignore'} || $scanlib::bugs{$nr}->{$bugcfg::debian_releases->{testing}.'-ignore'});

                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 

diff --git a/make-britney-counts b/make-britney-counts
index 2fc765673f26c36d3f95886ab94d87cb9b251792..1c5705584b62d075e1e4b6d521a23643797eb28c 100755 (executable)
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -48,7 +48,7 @@ while (my ($nr, $bug) = each %scanlib::bugs) {
 
                # this hack is specific to britney counts, and ignores
                # bugs tagged ignore for the next testing release
 
                # 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->{'wheezy-ignore'}) {
+               if (scanlib::check_worry_unstable($bug) and not $bug->{$bugcfg::debian_releases->{testing}.'-ignore'}) {

                        push @{$unstablebugs{$package}}, $nr;
                }
                if (scanlib::check_worry($bug)) {
                        push @{$unstablebugs{$package}}, $nr;
                }
                if (scanlib::check_worry($bug)) {

diff --git a/scanlib.pm b/scanlib.pm
index d11976a4cd44dc7816cc44a481d687c3ef053831..123abb9a7945345d27b8b01b548df5a27c41f62b 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -182,11 +182,10 @@ sub scanspooldir {
                }
                next if $skip==1;
        
                }
                next if $skip==1;
        

-               my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^squeeze$/, @tags);
-               $disttags{'stable'}       = grep(/^wheezy$/, @tags);
-               $disttags{'testing'}      = grep(/^jessie$/, @tags);
-               $disttags{'unstable'}     = grep(/^sid$/, @tags);
+               my %disttags = ();
+        for (qw(unstable stable testing unstable)) {
+            $disttags{$_}    = grep(/^$bug_cfg::debian_releases->{$_}$/, @tags);
+        }

                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
                # default according to vorlon 2007-06-17
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
                # default according to vorlon 2007-06-17


@@ -234,7 +233,8 @@ sub scanspooldir {
                        next if !$affects_any;
                }
 
                        next if !$affects_any;
                }
 

-               for my $keyword (qw(pending patch help moreinfo unreproducible security upstream squeeze-ignore wheezy-ignore jessie-ignore)) {
+               for my $keyword (qw(pending patch help moreinfo unreproducible security upstream),
+                         map {$_.$bug_cfg::debian_releases->{testing}.'-ignore'} keys %{$bug_cfg::debian_releases}) {

                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 


@@ -326,13 +326,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
 sub check_worry {
        my ($bi) = @_;
 

-       return ($bi->{'testing'} && !$bi->{'jessie-ignore'});
+       return ($bi->{'testing'} && !$bi->{$bug_cfg::debian_releases->{testing}.'-ignore'});

 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 

-       return ($bi->{'stable'} && !$bi->{'wheezy-ignore'});
+       return ($bi->{'stable'} && !$bi->{$bug_cfg::debian_releases->{stable}.'-ignore'});

 }
 
 sub check_worry_unstable {
 }
 
 sub check_worry_unstable {


@@ -352,7 +352,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";

-       $taginfo .= ($bi->{'wheezy-ignore'} || $bi->{'jessie-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{$bug_cfg::debian_releases->{stable}.'-ignore'} || $bi->{$bug_cfg::debian_releases->{testing}.'-ignore'}) ? "I" : " ";

 
        return $taginfo;
 }
 
        return $taginfo;
 }