From 375614d326e123b3f33a7a50aaed7f30b8d28a45 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Sat, 19 Jun 2010 21:10:44 -0700
Subject: fix for bug 5705

---
 lib/Vyatta/ConfigOutput.pm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'lib')

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 ';
-- 
cgit v1.2.3