[project @ 2001-04-24 19:10:26 by doogie]

Added support for an additional Maintainers.override file, which is read
after the normal one.  This allows the normal one to be externally updated,
but still have local overrides.

diff --git a/cgi/common.pl b/cgi/common.pl
index e6699734f918670130d9b1305f296e6e4f3866ff..c716112222e70e8a5934f1804e0e009d221371fb 100644 (file)
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -376,6 +376,14 @@ sub getmaintainers {
        $maintainer{$a}= $b;
     }
     close(MM);
+    open(MM,"$gMaintainerFileOverride") or &quit("open $gMaintainerFileOverride: $!");
+    while(<MM>) {
+       next unless m/^(\S+)\s+(\S.*\S)\s*$/;
+       ($a,$b)=($1,$2);
+       $a =~ y/A-Z/a-z/;
+       $maintainer{$a}= $b;
+    }
+    close(MM);
 
     return \%maintainer;
 }

diff --git a/scripts/config.debian b/scripts/config.debian
index 93dbb88ee7406d7af9aa4ed101cc0aa8e337c15c..59266a9d23c8d326a547f420f6981bb5c62a2c0f 100644 (file)
--- a/scripts/config.debian
+++ b/scripts/config.debian
@@ -1,5 +1,5 @@
 # This is the bugs.debian.org debbugs configuration file.
-# $Id: config.debian,v 1.10 2000/12/05 22:20:15 joy Exp $
+# $Id: config.debian,v 1.11 2001/04/24 19:10:26 doogie Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
@@ -68,4 +68,5 @@ $gAJIndex = "/debian/home/ajt/ajbug/pkgindex";                # AJ's package index
 
 # Required data files
 $gMaintainerFile = "$gConfigDir/Maintainers";
+$gMaintainerFileOverride = "$gConfigDir/Maintainers.override";
 $gPseudoDescFile = "$gConfigDir/pseudo-packages.description";

diff --git a/scripts/config.in b/scripts/config.in
index 97f8955cc5c08c8cd08c30ee60d5a32c6af6cb9d..b0ba4aa812d814d42461e46b39090786aa1c416b 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,6 +1,6 @@
 # This is the template debbugs configuration file.
 # You *must* edit it in order for debbugs to work.
-# $Id: config.in,v 1.12 2001/01/27 22:09:01 joy Exp $
+# $Id: config.in,v 1.13 2001/04/24 19:10:26 doogie Exp $
 
 # Domains
 $gEmailDomain = "bugs.something";                      # e.g. bugs.debian.org
@@ -67,4 +67,5 @@ $gAJIndex = "/debian/home/ajt/ajbug/pkgindex";                # AJ's package index
 
 # Required data files
 $gMaintainerFile = "$gConfigDir/Maintainers";
+$gMaintainerFileOverride = "$gConfigDir/Maintainers.override";
 $gPseudoDescFile = "$gConfigDir/pseudo-packages.description";

diff --git a/scripts/config.in.default b/scripts/config.in.default
index 73f36dd0514f8b0b2d327dcfe4f4f5c31c34bc5b..009a3a074d4d38dcb34c29cb924d3775b1854d71 100644 (file)
--- a/scripts/config.in.default
+++ b/scripts/config.in.default
@@ -1,4 +1,4 @@
-# $Id: config.in.default,v 1.2 1999/09/02 22:27:29 gecko Exp $
+# $Id: config.in.default,v 1.3 2001/04/24 19:10:26 doogie Exp $
 #domains
 $gEmailDomain = "bugs.top.domain";             #bugs.debian.org
 $gListDomain = "lists.top.domain";             #lists.debian.org
@@ -22,6 +22,7 @@ $gDocDir = "/usr/lib/debbugs";                        #location of doc files
 
 #data files
 $gMaintainerFile = "/etc/debbugs/Maintainers";
+$gMaintainerFileOverride = "/etc/debbugs/Maintainers.override";
 $gPseudoDescFile = "/etc/debbugs/pseudo-packages.description";
 
 #lists

diff --git a/scripts/process.in b/scripts/process.in
index 27e2505a284ebef560b8b2c5f8a4520391642148..9eae5b59a0a48bacefec4df98b952bdc41b6c4da 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.26 2001/03/18 05:13:52 doogie Exp $
+# $Id: process.in,v 1.27 2001/04/24 19:10:26 doogie Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -880,6 +880,15 @@ sub checkmaintainers {
         $maintainerof{$1}= $2;
     }
     close(MAINT);
+    open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!");
+    while (<MAINT>) {
+       m/^\n$/ && next;
+       m/^\s*$/ && next;
+        m/^(\S+)\s+(\S.*\S)\n$/ || &quit("maintainers.override bogus \`$_'");
+        $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
+        $maintainerof{$1}= $2;
+    }
+    close(MAINT);
     $anymaintfound=0; $anymaintnotfound=0;
     for $p (split(m/[ \t?,()]+/,$s_package)) {
         $p =~ y/A-Z/a-z/;

diff --git a/scripts/service.in b/scripts/service.in
index 3855db94f8a67f61fc6989726497ecaf6813f32d..083e5265382805421a0cb8ca2b1523b303ddda54 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.34 2001/03/18 05:59:43 doogie Exp $
+# $Id: service.in,v 1.35 2001/04/24 19:10:26 doogie Exp $
 # ^ more or less ^
 #
 # Usage: service <code>.nn
@@ -924,6 +924,14 @@ sub ensuremaintainersloaded {
         $maintainerof{$1}= $2;
     }
     close(MAINT);
+    open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!");
+    while (<MAINT>) {
+        m/^\n$/ && next;
+        m/^\s*$/ && next;
+        m/^(\S+)\s+(\S.*\S)\n$/ || &quit("maintainers.override bogus \`$_'");
+        $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
+        $maintainerof{$1}= $2;
+    }
 }
 
 sub sendinfo {

diff --git a/scripts/summary.in b/scripts/summary.in
index b62caa63494b57bbd39953b87fadb6b398454876..20cba4602c0fe97482be6263ca3b8033ca3e50aa 100755 (executable)
--- a/scripts/summary.in
+++ b/scripts/summary.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: summary.in,v 1.2 1999/09/02 22:27:29 gecko Exp $
+# $Id: summary.in,v 1.3 2001/04/24 19:10:26 doogie Exp $
 
 require('/etc/debbugs/config');
 require('/usr/lib/debbugs/errorlib');
@@ -17,6 +17,15 @@ while (<M>) {
     $maintainer{$a}= $b;
 }
 close(M);
+open(M,"$gMaintainerFileOverride") || &quit("open $gMaintainerFileOverride: $!");
+while (<M>) {
+    m/^(\S+)\s+(\S.*\S)\s*$/ || warn "$_ ?";
+    ($a,$b)=($1,$2);
+    $a =~ y/A-Z/a-z/;
+    $maintainer{$a}= $b;
+}
+close(M);
+               
 
 defined($startdate= time) || &quit("failed to get time: $!");