summaryrefslogtreecommitdiffstats
path: root/lib/puppet/metatype/evaluation.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/metatype/evaluation.rb')
-rw-r--r--lib/puppet/metatype/evaluation.rb6
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