diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-20 11:55:42 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-20 11:55:42 -0500 |
| commit | e1907798425a7b163ac1b831b0cf11e88985815e (patch) | |
| tree | 281191621b07b939ad724981d110b9a85463b5e1 /lib/puppet/metatype/evaluation.rb | |
| parent | 9f8bb7e42aeea4670d9292f935529f8db5d57bc5 (diff) | |
| parent | e00065a8e63a7222eacbc7e8aaa925e967fd5c60 (diff) | |
| download | puppet-e1907798425a7b163ac1b831b0cf11e88985815e.tar.gz puppet-e1907798425a7b163ac1b831b0cf11e88985815e.tar.xz puppet-e1907798425a7b163ac1b831b0cf11e88985815e.zip | |
Merge branch '0.24.x'
Diffstat (limited to 'lib/puppet/metatype/evaluation.rb')
| -rw-r--r-- | lib/puppet/metatype/evaluation.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/metatype/evaluation.rb b/lib/puppet/metatype/evaluation.rb index 08756e988..36328c537 100644 --- a/lib/puppet/metatype/evaluation.rb +++ b/lib/puppet/metatype/evaluation.rb @@ -108,7 +108,11 @@ class Puppet::Type # Are we running in noop mode? def noop? - @noop || Puppet[:noop] + if defined?(@noop) + @noop + else + Puppet[:noop] + end end def noop |