diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-19 11:11:34 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-19 11:11:34 -0700 |
| commit | 72cd6fb383335a62d2d1ab656cdff39c34de0f19 (patch) | |
| tree | 65f9b57d8dc4fbcfda5eaedbae0f9938b70d30e1 /lib/puppet/parser/scope.rb | |
| parent | 16d1f784cd00f8b3c3381caede44159c309487d7 (diff) | |
| parent | 656eff821bec534a23e3e81e86ddbe3fc28f10ed (diff) | |
| download | puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.tar.gz puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.tar.xz puppet-72cd6fb383335a62d2d1ab656cdff39c34de0f19.zip | |
Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.next
* tickets/2.6.x/4655-parameterized-classes-default-stages:
(#4655) Allow stage to be set using a default class parameter
Updated CHANGELOG for 2.6.8rc1
Diffstat (limited to 'lib/puppet/parser/scope.rb')
| -rw-r--r-- | lib/puppet/parser/scope.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 24f1d01f7..c369f129a 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -101,7 +101,7 @@ class Puppet::Parser::Scope # Remove this when rebasing def environment - compiler.environment + compiler ? compiler.environment : nil end # Are we the top scope? @@ -513,6 +513,6 @@ class Puppet::Parser::Scope def extend_with_functions_module extend Puppet::Parser::Functions.environment_module(Puppet::Node::Environment.root) - extend Puppet::Parser::Functions.environment_module(compiler ? environment : nil) + extend Puppet::Parser::Functions.environment_module(environment) end end |