diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-30 19:21:59 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-30 19:21:59 +0000 |
| commit | f69dcdab8e23017edcec0ffc9a6bcee6bf7fd608 (patch) | |
| tree | a3affc21858d42e8e366ef78eae5dd77a4ee663b /lib/puppet/parser | |
| parent | e05392e26491b71e83620f4310773a78ac3b6177 (diff) | |
| download | puppet-f69dcdab8e23017edcec0ffc9a6bcee6bf7fd608.tar.gz puppet-f69dcdab8e23017edcec0ffc9a6bcee6bf7fd608.tar.xz puppet-f69dcdab8e23017edcec0ffc9a6bcee6bf7fd608.zip | |
Working a little bit on rails failures, with no real progress
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2439 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/parser/resource/param.rb | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 906b28aca..d19b4ac1e 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -302,9 +302,9 @@ class Puppet::Parser::Resource end # Either way, now add our parameters - newparams = {} - @params.each { |name, p| newparams[name.to_s] = p } - resource.collection_merge :param_names, :existing => resource.param_names, :updates => newparams + updated_params = {} + @params.each { |name, p| updated_params[name.to_s] = p } + resource.collection_merge :param_names, :existing => resource.param_names, :updates => updated_params return resource end diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index bc33ba8f9..dc325487c 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -35,9 +35,7 @@ class Puppet::Parser::Resource::Param oldvals = [] if pv = pn.param_values - newvals = pv.each do |val| - oldvals << val.value - end + oldvals = pv.collect { |val| val.value } end if oldvals != values |