From 57287ae1d4151ec453ec9d33fafe4f1a4ced37e0 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 1 Nov 2012 01:07:27 -0700
Subject: x.509 support -- added certificate authority creation and server cert
 creation

---
 lib/leap_cli/config/object.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/leap_cli/config/object.rb')

diff --git a/lib/leap_cli/config/object.rb b/lib/leap_cli/config/object.rb
index e044353..06a4fef 100644
--- a/lib/leap_cli/config/object.rb
+++ b/lib/leap_cli/config/object.rb
@@ -79,8 +79,6 @@ module LeapCli
           end
         elsif self.has_key?(key)
           evaluate_value(key)
-        elsif @node != self
-          @node.get!(key)
         else
           raise NoMethodError.new(key, "No method '#{key}' for #{self.class}")
         end
@@ -110,7 +108,7 @@ module LeapCli
       #
       def deep_merge!(object)
         object.each do |key,new_value|
-          old_value = self[key]
+          old_value = self.fetch key, nil
           if old_value.is_a?(Hash) || new_value.is_a?(Hash)
             # merge hashes
             value = Config::Object.new(@manager, @node)
@@ -152,7 +150,7 @@ module LeapCli
         else
           if value =~ /^= (.*)$/
             begin
-              value = eval($1, self.send(:binding))
+              value = eval($1, @node.send(:binding))
               self[key] = value
             rescue SystemStackError => exc
               puts "STACK OVERFLOW, BAILING OUT"
-- 
cgit v1.2.3