summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/compiler.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
-rw-r--r--lib/puppet/parser/compiler.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index 121dae1b1..7ed000e19 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -120,11 +120,7 @@ class Puppet::Parser::Compiler
# Return the node's environment.
def environment
unless defined?(@environment)
- if node.environment and node.environment != ""
- @environment = node.environment
- else
- @environment = nil
- end
+ @environment = (node.environment and node.environment != "") ? node.environment : nil
end
Puppet::Node::Environment.current = @environment
@environment