diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-19 18:28:30 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-19 19:56:08 -0700 |
| commit | 1288f8c4051105d6cfbf4f532d5e5e926613e9df (patch) | |
| tree | 0a261524f25ddddbb63c6abd18b708a4d58baa00 /lib/puppet/parser | |
| parent | 539d71635132bd5f772a550b7bfff530e8b59b68 (diff) | |
| download | puppet-1288f8c4051105d6cfbf4f532d5e5e926613e9df.tar.gz puppet-1288f8c4051105d6cfbf4f532d5e5e926613e9df.tar.xz puppet-1288f8c4051105d6cfbf4f532d5e5e926613e9df.zip | |
[#4270] Force inherited classes to load into the correct environment
Parent classes were getting searched for in a way that fails if they
were not already loaded into an environment. This patch replaces that
codepath with a call that will load them if they are needed.
This bug was masked by another bug that loads all classes into
"production", whether they are used there or not.
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/type_loader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/type_loader.rb b/lib/puppet/parser/type_loader.rb index c33f90d11..35ad49593 100644 --- a/lib/puppet/parser/type_loader.rb +++ b/lib/puppet/parser/type_loader.rb @@ -88,7 +88,7 @@ class Puppet::Parser::TypeLoader nil end if result = yield(filename) - Puppet.info "Automatically imported #{name} from #{filename}" + Puppet.info "Automatically imported #{name} from #{filename} into #{environment}" result.module_name = modname if modname and result.respond_to?(:module_name=) return result end |