From 09dce6b77720b673f9334ec68177b7284149c418 Mon Sep 17 00:00:00 2001 From: doogie <> Date: Tue, 24 Apr 2001 18:10:26 -0800 Subject: [PATCH] [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. --- cgi/common.pl | 8 ++++++++ scripts/config.debian | 3 ++- scripts/config.in | 3 ++- scripts/config.in.default | 3 ++- scripts/process.in | 11 ++++++++++- scripts/service.in | 10 +++++++++- scripts/summary.in | 11 ++++++++++- 7 files changed, 43 insertions(+), 6 deletions(-) diff --git a/cgi/common.pl b/cgi/common.pl index e669973..c716112 100644 --- 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() { + 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 93dbb88..59266a9 100644 --- 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 97f8955..b0ba4aa 100644 --- 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 73f36dd..009a3a0 100644 --- 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 27e2505..9eae5b5 100755 --- 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 () { + 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 3855db9..083e526 100755 --- 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 .nn @@ -924,6 +924,14 @@ sub ensuremaintainersloaded { $maintainerof{$1}= $2; } close(MAINT); + open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!"); + while () { + 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 b62caa6..20cba46 100755 --- 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 () { $maintainer{$a}= $b; } close(M); +open(M,"$gMaintainerFileOverride") || &quit("open $gMaintainerFileOverride: $!"); +while () { + 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: $!"); -- 2.39.2