diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-04-18 22:00:54 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-04-18 22:00:54 +0000 |
| commit | eefb833a9353d14b0a737392fc6cd64d539435ba (patch) | |
| tree | 9d81a51b6aab5f0e644a91af697d871a007186aa /lib/sbin/MakeUtils.pl | |
| parent | 1beb41b280de63c1607bd0f029b7387fd2271c87 (diff) | |
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
Diffstat (limited to 'lib/sbin/MakeUtils.pl')
| -rw-r--r-- | lib/sbin/MakeUtils.pl | 8 |
1 files changed, 4 insertions, 4 deletions
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"; } } |