diff options
| author | elijah <elijah@riseup.net> | 2012-11-01 01:07:27 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-11-01 01:07:27 -0700 |
| commit | 57287ae1d4151ec453ec9d33fafe4f1a4ced37e0 (patch) | |
| tree | fe63a8de11c41d247fc3634277bc49c1ca7cd689 /lib/leap_cli/config/object.rb | |
| parent | f339e7b94ab8920fd1e271c50145b5d2d1a8ac9d (diff) | |
| download | leap_cli-57287ae1d4151ec453ec9d33fafe4f1a4ced37e0.tar.gz leap_cli-57287ae1d4151ec453ec9d33fafe4f1a4ced37e0.tar.bz2 | |
x.509 support -- added certificate authority creation and server cert creation
Diffstat (limited to 'lib/leap_cli/config/object.rb')
| -rw-r--r-- | lib/leap_cli/config/object.rb | 6 |
1 files changed, 2 insertions, 4 deletions
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" |