summaryrefslogtreecommitdiff
path: root/lib/Vyatta
diff options
context:
space:
mode:
authorMichael Larson <slioch@slioch.vyatta.com>2010-06-19 21:10:44 -0700
committerMichael Larson <slioch@slioch.vyatta.com>2010-06-19 21:10:44 -0700
commit375614d326e123b3f33a7a50aaed7f30b8d28a45 (patch)
treefd4abdeb77d47a8ee8d37bd812c2829830f95bec /lib/Vyatta
parent963edb04cac4f1350a1d795e444f00d3ec8d06d2 (diff)
downloadvyatta-cfg-375614d326e123b3f33a7a50aaed7f30b8d28a45.tar.gz
vyatta-cfg-375614d326e123b3f33a7a50aaed7f30b8d28a45.zip
fix for bug 5705
Diffstat (limited to 'lib/Vyatta')
-rwxr-xr-xlib/Vyatta/ConfigOutput.pm19
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/Vyatta/ConfigOutput.pm b/lib/Vyatta/ConfigOutput.pm
index 09713f9..10cd5f2 100755
--- a/lib/Vyatta/ConfigOutput.pm
+++ b/lib/Vyatta/ConfigOutput.pm
@@ -335,12 +335,12 @@ sub displayChildren {
my ($state, $n) = $config->getDeactivated($path);
if (defined $state) {
if ($state eq 'active') {
- if ($child_hash{$child} eq 'deleted') {
- $dis = '! ';
- }
- else {
- $dis = 'A ';
- }
+ if ($child_hash{$child} eq 'deleted') {
+ $dis = '! ';
+ }
+ else {
+ $dis = 'A ';
+ }
}
elsif ($state eq 'local') {
$dis = 'D ';
@@ -390,7 +390,12 @@ sub displayChildren {
my ($state, $n) = $config->getDeactivated($path);
if (defined $state) {
if ($state eq 'active') {
- $dis = 'A ';
+ if ($cnodes{$cname} eq 'deleted') {
+ $dis = '! ';
+ }
+ else {
+ $dis = 'A ';
+ }
}
elsif ($state eq 'local') {
$dis = 'D ';