From: cjwatson <>
Date: Mon, 21 Oct 2002 15:37:29 +0000 (-0800)
Subject: [project @ 2002-10-21 08:37:29 by cjwatson]
X-Git-Tag: release/2.6.0~1018
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0c22d7e806882188bc5272ecdc59b9bf3ad896d1;p=debbugs.git

[project @ 2002-10-21 08:37:29 by cjwatson]
Cope with a component column (main, contrib, etc.) in $gPackageSource.
---

diff --git a/scripts/process.in b/scripts/process.in
index 5e005ce0..c5065063 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.52 2002/10/20 13:21:15 cjwatson Exp $
+# $Id: process.in,v 1.53 2002/10/21 08:37:29 cjwatson Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -947,7 +947,7 @@ sub checkmaintainers {
     close(MAINT);
     open(SOURCES,"$gPackageSource") || &quit("pkgsrc open: $!");
     while (<SOURCES>) {
-        next unless m/^(\S+)\s+(\S.*\S)\s*$/;
+        next unless m/^(\S+)\s+\S+\s+(\S.*\S)\s*$/;
 	($a,$b)=($1,$2);
 	$a =~ y/A-Z/a-z/;
 	$pkgsrc{$a} = $b;
diff --git a/scripts/service.in b/scripts/service.in
index 6ee0e580..4c59d5dd 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.58 2002/10/20 16:17:21 cjwatson Exp $
+# $Id: service.in,v 1.59 2002/10/21 08:37:29 cjwatson Exp $
 # ^ more or less ^
 #
 # Usage: service <code>.nn
@@ -1062,7 +1062,7 @@ sub ensuremaintainersloaded {
 
     open(SOURCES, "$gPackageSource") || &quit("pkgsrc open: $!");
     while (<SOURCES>) {
-	next unless m/^(\S+)\s+(\S.*\S)\s*$/;
+	next unless m/^(\S+)\s+\S+\s+(\S.*\S)\s*$/;
 	my ($a, $b) = ($1, $2);
 	$pkgsrc{lc($a)} = $b;
     }