From 70a5badd225f432f44268d027a617d7674169d35 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Thu, 27 May 2010 16:49:15 -0700
Subject: fix for content-inspection on deactivate.

further changes forthcoming to the perl api to support interfaces outside of listNodes.
---
 lib/Vyatta/Config.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/Vyatta')

diff --git a/lib/Vyatta/Config.pm b/lib/Vyatta/Config.pm
index 91f8101..cc917b4 100755
--- a/lib/Vyatta/Config.pm
+++ b/lib/Vyatta/Config.pm
@@ -93,7 +93,12 @@ sub listNodes {
     $tmp =~ s/\n//g;
     $tmp =~ s/%2F/\//g;
     #print "DEBUG Vyatta::Config->listNodes(): node = $tmp\n";
-    push @nodes_modified, $tmp;
+    my $ttmp = $self->{_current_dir_level} . "/" . $tmp;
+    $ttmp =~ s/\// /g;
+    my ($status, undef) = $self->getDeactivated($ttmp);
+    if (!defined($status) || $status eq 'active') {
+	push @nodes_modified, $tmp;
+    }
   }
 
   return @nodes_modified;
@@ -583,9 +588,7 @@ sub getDeactivated {
   $node =~ s/\//%2F/g;
   $node =~ s/\s+/\//g;
   #now walk up parent in local and in active looking for '.disable' file
-
-  my @a = split(" ",$node);
-  $node = join("/",@a);
+  $node =~ s/ /\//g;
 
   while (1) {
       my $filepath = "$self->{_changes_only_dir_base}/$node";
-- 
cgit v1.2.3