From 456a7208e3d585348130d33ef6028fcbecd7fe32 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Fri, 4 Jun 2010 15:29:54 -0700
Subject: modified show output when root deactivated node is deleted. in this
 case suppress the active designation.

---
 lib/Vyatta/ConfigOutput.pm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/Vyatta/ConfigOutput.pm b/lib/Vyatta/ConfigOutput.pm
index d2afdbb..c92cee4 100755
--- a/lib/Vyatta/ConfigOutput.pm
+++ b/lib/Vyatta/ConfigOutput.pm
@@ -210,12 +210,7 @@ sub displayDeletedOrigChildren {
 	my ($state, $n) = $config->getDeactivated($path);
 	if (defined $state) {
 	      if ($state eq 'active') {
-		  if (defined($dont_show_as_deleted)) {
-		      $dis = '! ';
-		  }
-		  else {
-		      $dis = 'A ';
-		  }
+		  $dis = '! ';
 	      }
 	      elsif ($state eq 'local') {
 		  if (defined($dont_show_as_deleted)) {
@@ -263,12 +258,7 @@ sub displayDeletedOrigChildren {
 	  my ($state, $n) = $config->getDeactivated($path);
 	  if (defined $state) {
 	      if ($state eq 'active') {
-		  if (defined($dont_show_as_deleted)) {
-		      $dis = '! ';
-		  }
-		  else {
-		      $dis = 'A ';
-		  }
+		  $dis = '! ';
 	      }
 	      elsif ($state eq 'local') {
 		  if (defined($dont_show_as_deleted)) {
@@ -345,7 +335,12 @@ sub displayChildren {
 	my ($state, $n) = $config->getDeactivated($path);
 	if (defined $state) {
 	      if ($state eq 'active') {
-		  $dis = 'A ';
+                 if ($child_hash{$child} eq 'deleted') {
+                     $dis = '! ';
+                 }
+                 else {
+                     $dis = 'A ';
+                 }
 	      }
 	      elsif ($state eq 'local') {
 		  $dis = 'D ';
-- 
cgit v1.2.3