diff options
author | Matt Robinson <matt@puppetlabs.com> | 2011-01-21 14:07:32 -0800 |
---|---|---|
committer | Matt Robinson <matt@puppetlabs.com> | 2011-01-24 16:44:41 -0800 |
commit | 3cfbd0722c5f64a3ef39a65f53fa4195135e90b4 (patch) | |
tree | a4d7e75ee14d9396c22839debeabb442d4f47dd7 /lib/puppet/parser/compiler.rb | |
parent | a2036ea693996cb6ba5eb9f8f52fefa843a320a6 (diff) | |
download | puppet-3cfbd0722c5f64a3ef39a65f53fa4195135e90b4.tar.gz puppet-3cfbd0722c5f64a3ef39a65f53fa4195135e90b4.tar.xz puppet-3cfbd0722c5f64a3ef39a65f53fa4195135e90b4.zip |
(#5045) Cleaning up some tests and code
Renamed some variables to be clearer, made tests use less stubbing,
added some additional tests and got rid of some unecessary logic.
Paired-with: Dan Bode
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
-rw-r--r-- | lib/puppet/parser/compiler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index 3134e03d9..fdabd05c9 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -153,7 +153,7 @@ class Puppet::Parser::Compiler if param_classes resource = klass.ensure_in_catalog(scope, param_classes[name] || {}) else - found << name and next if scope.class_scope(klass) and !param_classes + found << name and next if scope.class_scope(klass) resource = klass.ensure_in_catalog(scope) end |