From: Debian BTS <debbugs@busoni>
Date: Mon, 13 Jun 2011 20:38:08 +0000 (+0000)
Subject: merge changes from dla bugscan tree
X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=179fea92bb01339575f3666554e0703ca5cc3881;hp=-c

merge changes from dla bugscan tree
---

179fea92bb01339575f3666554e0703ca5cc3881
diff --combined bugcfg.pm
index d6ad3a8,f3f5af4..e6899a5
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@@ -6,30 -6,23 +6,24 @@@ use warnings
  package bugcfg;
  our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist);
  
+ use Debbugs::Config qw(:config);
+ 
  # General configuration stuff
  
- my $host=`hostname`;
- chomp $host;
- if ($host eq "master" or $host eq "spohr" or $host eq "rietz" or $host eq "busoni") {
- 	$spooldir	= "/org/bugs.debian.org/debbugs/spool/db-h";
- 	$maintainerlist	= "/etc/debbugs/Maintainers";
- 	$debian_ftproot	= "/org/bugs.debian.org/etc/indices/ftp/testing";
- 	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
- 	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
- } elsif ($host eq "merkel") {
- 	$spooldir	= "/org/bugs.debian.org/spool/db-h";
- 	$maintainerlist	= "/etc/debbugs/Maintainers";
- 	$debian_ftproot	= "/org/bugs.debian.org/etc/indices/ftp/testing";
- 	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
- 	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
- } else {
- 	die "Unknown machine, please configure paths in bugcfg.pm\n";
- }
+ $spooldir = $config{spool_dir};
+ $maintainerlist = $config{maintainer_file};
+ $debian_ftproot = $config{package_source}
+ $debian_sources = $config{package_source};
+ $pseudolist = $config{pseudo_desc_file};
+ 
+ $debian_sources	= "/etc/debbugs/indices/ftp.sources";
+ 
+ 
  
 -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		= ( "serious", "grave", "critical" );
+ our @priorities		= $config{strong_severities};
  our @skiptags		= ( );
  
  1;
diff --combined bugreport
index 22f4775,fd8355f..67ecf93
--- a/bugreport
+++ b/bugreport
@@@ -103,7 -103,7 +103,7 @@@ sub MakeBuglist() 
  				} elsif ($scanlib::bugs{$nr}->{'help'}) {
  					print '<span style="color: #ffaa30">';
  				}
 -				print "<strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
 +				print "<strike>" if ($scanlib::bugs{$nr}->{'wheezy-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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),
@@@ -111,7 -111,7 +111,7 @@@
  					scanlib::get_relinfo($scanlib::bugs{$nr}), 
  					scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
  				print "</em>" if $worry;
 -				print "</strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});
 +				print "</strike>" 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 +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}));
  
@@@ -152,12 -152,12 +152,12 @@@
  	}
  
  	if ($html) {
- 		print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
+ 		print "<strong><font color=\"red\">Total number of release-critical bugs</font>:</strong> $bugcount<BR>\n";
  		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 concerning the current stable release:</strong> %d<BR>\n", $stabletotal);
- 		printf("<strong>Number concerning the next release:</strong> %d<P>\n", $worrytotal);
+ 		printf("<strong><font color=\"blue\">Number concerning the current stable release</font>:</strong> %d<BR>\n", $stabletotal);
+ 		printf("<strong><font color=\"green\">Number concerning the next release</font>:</strong> %d<P>\n", $worrytotal);
  	} else {
  		print "Total number of release-critical bugs: $bugcount\n";
  		printf("Number that have a patch: %d\n", $patchtotal);