diff options
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index 0a9d0804f..e64ec4ba3 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -121,7 +121,7 @@ class Puppet::Parser::Compiler # Return the node's environment. def environment - unless defined? @environment + unless defined?(@environment) if node.environment and node.environment != "" @environment = node.environment else @@ -189,7 +189,7 @@ class Puppet::Parser::Compiler end # Create a new scope, with either a specified parent scope or - # using the top scope. + # using the top scope. def newscope(parent, options = {}) parent ||= topscope options[:compiler] = self @@ -355,8 +355,7 @@ class Puppet::Parser::Compiler end unless remaining.empty? - raise Puppet::ParseError, "Failed to realize virtual resources %s" % - remaining.join(', ') + raise Puppet::ParseError, "Failed to realize virtual resources %s" % remaining.join(', ') end end |