merge changes from dla bugscan tree

diff --git a/bugcfg.pm b/bugcfg.pm
index d6ad3a83a481dfc692810f50ba2baa2e49a5252b..e6899a5f119c3b4a6fdbe1da8aa513d3240e3e06 100644 (file)
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -6,30 +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";
+
+
 
 # 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 --git a/bugreport b/bugreport
index 22f4775cc3df22b417109e4276de9a760c6e8610..67ecf935bba69b5caa3aba2bdbe9c5d558e8c672 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -152,12 +152,12 @@ sub MakeStatistics() {
        }
 
        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);