From 0494d74dc72f2c40430b8a426fd55a71a4f02bd7 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Thu, 3 Jun 2010 18:14:04 -0700
Subject:     implemented modified notation for pre-commit activate/deactivate.
 added check on modified nodes prior to     load. modified active directory
 check.

---
 lib/Vyatta/Config.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/Vyatta/Config.pm')

diff --git a/lib/Vyatta/Config.pm b/lib/Vyatta/Config.pm
index 0e71ccf..93a2478 100755
--- a/lib/Vyatta/Config.pm
+++ b/lib/Vyatta/Config.pm
@@ -594,7 +594,7 @@ sub existsOrig {
       my ($status, undef) = $self->getDeactivated($ttmp);
       #only return value if status is not disabled (i.e. local or both)
       if (defined($status) && ($status eq 'both' || $status eq 'active')) { #if a .disable is in local or active or both then return false
-	  return undef;
+	  return;
       }
   }
 
@@ -678,7 +678,7 @@ sub getDeactivated {
   $node =~ s/ /\//g;
 
   while (1) {
-      my $filepath = "$self->{_changes_only_dir_base}/$node";
+      my $filepath = "$self->{_new_config_dir_base}/$node";
       my $filepathActive = "$self->{_active_dir_base}/$node";
 
       my $local = $filepath . "/.disable";
-- 
cgit v1.2.3