From ee8c4f7495f2ebca7a887e4adcba7378df7c41cf Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 8 Mar 2007 21:58:46 +0000
Subject: [PATCH] Fix the level merge code -- again

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5468 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 New/compiler.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/New/compiler.pl b/New/compiler.pl
index 2b7b0a4d1..c6c5c4c64 100755
--- a/New/compiler.pl
+++ b/New/compiler.pl
@@ -1084,17 +1084,18 @@ sub merge_levels ($$) {
 
     my $target   = $subparts[0];
 
-    push @subparts, '' while @subparts < 3;   #Avoid undefined values
+    push @subparts, '' while @subparts < 3;   #Avoid undefined value
+s
     my $level = $supparts[1];
 
-    if ( $subparts == 3 ) {
+    if ( @supparts == 3 ) {
 	return "$target:none!:$supparts[2]"   if $level eq 'none!';
 	return "$target:$level:$supparts[2]"  if $level =~ /!$/;
 	return $subordinate                   if $subparts >= 2;
 	return "$target:$level";
     } 
 
-    if ( $subparts == 2 ) {
+    if ( @supparts == 2 ) {
 	return "$target:none!"                if $level eq 'none!';
 	return "$target:$level"               if ($level =~ /!$/) || ($subparts < 2);
     }