diff options
author | root <root@eng-140.vyatta.com> | 2008-07-09 11:50:17 -0700 |
---|---|---|
committer | root <root@eng-140.vyatta.com> | 2008-07-09 11:50:17 -0700 |
commit | 42d6c942800e2273b77ea92371ffdcb3f183163f (patch) | |
tree | 20f719fd409d57fb93c67d6a6c0be37d9598b02a /scripts | |
parent | 1277a4a911cf39e0e2200eea8ecbd483d1610f2f (diff) | |
download | vyatta-cfg-42d6c942800e2273b77ea92371ffdcb3f183163f.tar.gz vyatta-cfg-42d6c942800e2273b77ea92371ffdcb3f183163f.zip |
fix for bug 3441. Removed def from listOutputNodes(), which allowed other code that filters out def file to be removed.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/VyattaConfig.pm | 4 | ||||
-rwxr-xr-x | scripts/VyattaConfigLoad.pm | 3 | ||||
-rwxr-xr-x | scripts/VyattaConfigOutput.pm | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/scripts/VyattaConfig.pm b/scripts/VyattaConfig.pm index 3c4b51f..1c0eaf3 100755 --- a/scripts/VyattaConfig.pm +++ b/scripts/VyattaConfig.pm @@ -130,7 +130,9 @@ sub listOrigNodes { $tmp =~ s/\n//g; $tmp =~ s/%2F/\//g; #print "DEBUG VyattaConfig->listNodes(): node = $tmp\n"; - push @nodes_modified, $tmp; + if ($tmp ne 'def') { + push @nodes_modified, $tmp; + } } return @nodes_modified; diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index 1a7f26e..c8563bb 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -297,9 +297,6 @@ sub findDeletedNodes { $active_cfg->setLevel(join ' ', @active_path); my @active_nodes = $active_cfg->listOrigNodes(); foreach (@active_nodes) { - if ($_ eq 'def') { - next; - } if ($_ eq 'node.val') { findDeletedValues($new_ref, \@active_path); next; diff --git a/scripts/VyattaConfigOutput.pm b/scripts/VyattaConfigOutput.pm index 5358c21..ab7068f 100755 --- a/scripts/VyattaConfigOutput.pm +++ b/scripts/VyattaConfigOutput.pm @@ -138,7 +138,7 @@ sub displayValues { my @cnames = sort keys %cnodes; if (defined($simple_show)) { - if (!$cnodes{'def'} || $show_all) { + if ($show_all) { if ($is_password && $hide_password) { $oval = $HIDE_PASSWORD; } @@ -159,7 +159,7 @@ sub displayValues { $diff = '>'; } } - if (!$cnodes{'def'} || $show_all) { + if ($show_all) { if ($is_password && $hide_password) { $value = $HIDE_PASSWORD; } @@ -194,8 +194,6 @@ sub displayDeletedOrigChildren { if ($cnames[0] eq 'node.val') { displayValues([ @cur_path, $child ], $prefix, $child, $dont_show_as_deleted); - } elsif ($cnames[0] eq 'def') { - #ignore } elsif (scalar($#cnames) >= 0) { if ($is_tag) { @cnames = sort versioncmp @cnames; |