[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 5e005ce0a1890c0df49b310adc076239d667ea60..c50650634e5f0dbc368548f89d9634bdef026631 100755 (executable)
--- 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 6ee0e5804901f937a9ff8f04f47ef49fecb413c9..4c59d5dde3ef24df4d7bf31e53b87ccffa9bdc4a 100755 (executable)
--- 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;
     }