diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-08-17 20:20:28 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-08-17 20:20:28 +0000 |
| commit | b70434185c3e03b4c7c09e306c0872705bfc4ea9 (patch) | |
| tree | 85f8c3a96ecd8244e2f291d1be197195ad289ba5 /lib | |
| parent | 84b4ec81232da53c9b3263a14920ba3f294b050d (diff) | |
Fix to patch for PR 821. Hopefully these regexes will work better.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3839 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbin/interface_parser.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl index cc8d7985..0eb468cb 100644 --- a/lib/sbin/interface_parser.pl +++ b/lib/sbin/interface_parser.pl @@ -636,18 +636,18 @@ sub check_interface_consistency } foreach $private_group (split " ",$interface_data{"\U$thorn\E PRIVATE GROUPS"}) { - if ($interface_data{"\U$ancestor_thorn\E PUBLIC GROUPS"} =~ m:([\^\s]+$private_group[$\s]+):) + if ($interface_data{"\U$ancestor_thorn\E PUBLIC GROUPS"} =~ m:(\b$private_group\b):) { - $message = "Private group $private_group in thorn $thorn has same name as \n public group in ancestor implementation $ancestor_imp (i.e. thorn $ancestor_thorn)"; + $message = "Private group $private_group in thorn $thorn has same name as \n public group in ancestor implementation $ancestor_imp (e.g. thorn $ancestor_thorn)"; &CST_error(0,$message,"",__LINE__,__FILE__); } foreach $var (split " ", $interface_data{"\U$thorn\E GROUP \U$private_group\E"}) { foreach $pub_anc(split " ", $interface_data{"\U$ancestor_thorn\E PUBLIC GROUPS"}) { - if ($interface_data{"\U$ancestor_thorn\E GROUP \U$pub_anc\E"} =~ /$var/i) + if ($interface_data{"\U$ancestor_thorn\E GROUP \U$pub_anc\E"} =~ m/\b$var\b/i) { - $message = "Private variable $var in group $private_group in thorn $thorn has same name as \n a variable in public group: $pub_anc in ancestor implementation $ancestor_imp (i.e. thorn $ancestor_thorn)"; + $message = "Private variable $var in group $private_group in thorn $thorn has same name as \n a variable in public group: $pub_anc in ancestor implementation $ancestor_imp (e.g. thorn $ancestor_thorn)"; &CST_error(0,$message,"",__LINE__,__FILE__); } |