From: Debian BTS Date: Wed, 15 Jun 2011 18:15:20 +0000 (+0000) Subject: merge changes from dla bugscan tree X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=c06105a4add036334925afe529984bf7a442bd86;hp=2c592e46858e83621bcf57c495af548c28f68406 merge changes from dla bugscan tree --- diff --git a/bugcfg.pm b/bugcfg.pm index 8b64929..1d237a5 100644 --- a/bugcfg.pm +++ b/bugcfg.pm @@ -18,9 +18,11 @@ $pseudolist = $config{pseudo_desc_file}; $debian_sources = "/etc/debbugs/indices/ftp.sources"; +$debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing"; -our @architectures = ( "i386", "amd64", "alpha", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" ); +# alpha excluded to RM request +our @architectures = ( "i386", "amd64", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" ); our @sections = ( "main", "contrib", "non-free" ); our @priorities = $config{strong_severities}; our @skiptags = ( ); diff --git a/bugcounts b/bugcounts index 6925f2b..8336c90 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->{'lenny-ignore'} || $bug->{'squeeze-ignore'}); + $ignorecount++ if ($bug->{'wheezy-ignore'} || $bug->{'squeeze-ignore'}); $worrycount++ if (scanlib::check_worry($bug)); $stablecount++ if (scanlib::check_worry_stable($bug)); } diff --git a/bugreport b/bugreport index fd8355f..67ecf93 100755 --- a/bugreport +++ b/bugreport @@ -103,7 +103,7 @@ sub MakeBuglist() { } elsif ($scanlib::bugs{$nr}->{'help'}) { print ''; } - print "" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'}); + print "" if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'}); + print "" if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'}); + $ignoretotal++ if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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 9235b19..8a1055f 100755 --- a/dohtml +++ b/dohtml @@ -51,12 +51,12 @@ tags:
  • R: unreproducible
  • S: security
  • U: upstream
    • -
  • I: lenny-ignore or squeeze-ignore
    • +
  • I: wheezy-ignore or squeeze-ignore

    • The second set of tags indicate what releases a bug applies to: -O for oldstable (etch), S for stable (lenny), T for testing (squeeze), +O for oldstable (lenny), S for stable (squeeze), T for testing (wheezy), U for unstable (sid) or E for experimental.

    diff --git a/makepost b/makepost index df95255..cfe6937 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 (sarge), S for stable (lenny), T for testing (squeeze), +O for oldstable (lenny), S for stable (squeeze), T for testing (wheezy), U for unstable (sid) or E for experimental. ------------------------------------------------------------------------------ diff --git a/scanlib.pm b/scanlib.pm index 43cfb8d..60e4cf4 100644 --- a/scanlib.pm +++ b/scanlib.pm @@ -183,9 +183,9 @@ sub scanspooldir { next if $skip==1; my %disttags = (); - $disttags{'oldstable'} = grep(/^etch$/, @tags); - $disttags{'stable'} = grep(/^lenny$/, @tags); - $disttags{'testing'} = grep(/^squeeze$/, @tags); + $disttags{'oldstable'} = grep(/^lenny$/, @tags); + $disttags{'stable'} = grep(/^squeeze$/, @tags); + $disttags{'testing'} = grep(/^wheezy$/, @tags); $disttags{'unstable'} = grep(/^sid$/, @tags); $disttags{'experimental'} = grep(/^experimental$/, @tags); @@ -234,7 +234,7 @@ sub scanspooldir { next if !$affects_any; } - for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore) { + for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore wheezy-ignore) { $bi->{$keyword} = grep(/^$keyword$/, @tags); } @@ -326,13 +326,13 @@ sub wwwname() { sub check_worry { my ($bi) = @_; - return ($bi->{'testing'} && !$bi->{'squeeze-ignore'}); + return ($bi->{'testing'} && !$bi->{'wheezy-ignore'}); } sub check_worry_stable { my ($bi) = @_; - return ($bi->{'stable'} && !$bi->{'lenny-ignore'}); + return ($bi->{'stable'} && !$bi->{'squeeze-ignore'}); } 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->{'lenny-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " "; + $taginfo .= ($bi->{'wheezy-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " "; return $taginfo; }