From eefb833a9353d14b0a737392fc6cd64d539435ba Mon Sep 17 00:00:00 2001
From: allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Wed, 18 Apr 2001 22:00:54 +0000
Subject: Fixing Cactus/618

Bugs in thorninfo about inherits, and also found a new bug in the information
about shared parameters


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2126 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/sbin/MakeUtils.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/sbin/MakeUtils.pl b/lib/sbin/MakeUtils.pl
index 01eea96d..04c3bc6e 100644
--- a/lib/sbin/MakeUtils.pl
+++ b/lib/sbin/MakeUtils.pl
@@ -142,11 +142,11 @@ sub ThornInfo
     {
       $implementation = $1;
     }
-    elsif (m/^\s*INHERITS\s*:((\s*[a-zA-Z]+[a-zA-Z_0-9]*)*\s*)$/i)
+    elsif (m/^\s*INHERITS\s*:((\s*[a-zA-Z]+[a-zA-Z_0-9,]*)*\s*)$/i)
     {
       $inherits = $1;
     }
-    elsif (m/^\s*FRIEND\s*:((\s*[a-zA-Z]+[a-zA-Z_0-9]*)*\s*)$/i)
+    elsif (m/^\s*FRIEND\s*:((\s*[a-zA-Z]+[a-zA-Z_0-9,]*)*\s*)$/i)
     {
       $friends = $1;
     }
@@ -159,9 +159,9 @@ sub ThornInfo
   while(<PARAM>)
   {
     chomp;
-    if($line =~ m/SHARES\s*:(.*)/i)
+    if(m/SHARES\s*:(.*)/i)
     {
-      $share .= " $1";
+      $shares .= " $1";
     }
   }
 
-- 
cgit v1.2.3