diff options
| author | Saku Ytti <saku@ytti.fi> | 2014-07-21 16:17:09 +0300 |
|---|---|---|
| committer | Saku Ytti <saku@ytti.fi> | 2014-07-21 16:17:09 +0300 |
| commit | c90c4db50796e3708499c93c871d1ab8968f092a (patch) | |
| tree | 9fc2bfd606a5f9299e5152eeda1b51a1f9e383d8 | |
| parent | 723278d17c2fa84b2c8e17959f53e04eec7d9aa7 (diff) | |
Fix bug in 'vars.rb'0.1.1
We need to return value of 'r' instead of value of previous evaluation.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/oxidized/config/vars.rb | 1 | ||||
| -rw-r--r-- | oxidized.gemspec | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..912812a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +# 0.1.1 +- BUGFIX: vars needs to return value of r, not value of evaluation diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb index 40e4808..1fd81ef 100644 --- a/lib/oxidized/config/vars.rb +++ b/lib/oxidized/config/vars.rb @@ -5,5 +5,6 @@ module Oxidized::Config::Vars r = @node.vars[name] unless @node.vars.nil? r ||= Oxidized::CFG.groups[@node.group].vars[name.to_s] if Oxidized::CFG.groups.has_key?(@node.group) r ||= Oxidized::CFG.vars[name.to_s] if Oxidized::CFG.vars.has_key?(name) + r end end diff --git a/oxidized.gemspec b/oxidized.gemspec index 9d8e38f..5c396a2 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'oxidized' - s.version = '0.1.0' + s.version = '0.1.1' s.licenses = ['Apache-2.0'] s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti' ] |