diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-12 13:13:30 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-12 13:13:30 -0700 |
| commit | 2dfa0afb57ec80f451a54ef96341d413819c14c7 (patch) | |
| tree | 228ce122f952d72b513562a1874f93624ce855fb /lib/puppet/parser/resource.rb | |
| parent | 665fabdb3e468d1ef38d689b9cb0d75b9d788f88 (diff) | |
| parent | e569f3baec68b9f53b37ac07984b7a858b155991 (diff) | |
| download | puppet-2dfa0afb57ec80f451a54ef96341d413819c14c7.tar.gz puppet-2dfa0afb57ec80f451a54ef96341d413819c14c7.tar.xz puppet-2dfa0afb57ec80f451a54ef96341d413819c14c7.zip | |
Merge branch 'ticket/next/5027' into next
Diffstat (limited to 'lib/puppet/parser/resource.rb')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index c007d4dbe..ace01bb4b 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -241,7 +241,7 @@ class Puppet::Parser::Resource < Puppet::Resource def add_backward_compatible_relationship_param(name) # Skip metaparams for which we get no value. - return unless val = scope.lookupvar(name.to_s, false) and val != :undefined + return unless val = scope.lookupvar(name.to_s) and val != :undefined # The default case: just set the value set_parameter(name, val) and return unless @parameters[name] |