diff options
| author | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:43:37 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:43:37 -0700 |
| commit | 8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7 (patch) | |
| tree | eea1c778ce0b1e0cb192071ed697f0a68de252af /scripts/VyattaConfigOutput.pm | |
| parent | 94c402a24ed5a5a3e9b6aeaabc47446efb1a7a37 (diff) | |
| parent | 42d6c942800e2273b77ea92371ffdcb3f183163f (diff) | |
| download | vyatta-cfg-8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7.tar.gz vyatta-cfg-8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7.zip | |
Merge branch 'hollywood' of git:/git/vyatta-cfg into hollywood
Diffstat (limited to 'scripts/VyattaConfigOutput.pm')
| -rwxr-xr-x | scripts/VyattaConfigOutput.pm | 6 |
1 files changed, 2 insertions, 4 deletions
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; |