diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-08-05 10:34:35 -0700 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-08-12 12:01:23 -0700 |
| commit | 6b1dd81799a44288287d9ab0cdf46afa3aaf090a (patch) | |
| tree | 22bc60ccb797304481ece7a73ff2119a0e1e338a /lib/puppet/parser/parser_support.rb | |
| parent | 6dbd4771265173a9d4c3e7756c35c9ca371ca394 (diff) | |
| download | puppet-6b1dd81799a44288287d9ab0cdf46afa3aaf090a.tar.gz puppet-6b1dd81799a44288287d9ab0cdf46afa3aaf090a.tar.xz puppet-6b1dd81799a44288287d9ab0cdf46afa3aaf090a.zip | |
[#4472]+[#4483] Moved type-name resolution out of Puppet::Parser::TypeLoader.
Moved type-name resolution out of Puppet::Parser::TypeLoader, and into
its primary client, Puppet::Resource::TypeCollection. TypeCollection
now always passes fully qualified type names to TypeLoader.
This avoids duplicate type-name resolution logic between TypeLoader
and TypeCollection. That in turn fixes bug 4472, which resulted
from flaws in the type-name resolution logic in TypeLoader.
In addition, it fixes bug 4483, which resulted from improper
interleaving between looking up names using the TypeCollection and the
TypeLoader.
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
| -rw-r--r-- | lib/puppet/parser/parser_support.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index c0fd37178..97d985cfb 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -103,11 +103,11 @@ class Puppet::Parser::Parser end def find_hostclass(namespace, name) - known_resource_types.find_or_load(namespace, name, :hostclass) + known_resource_types.find_hostclass(namespace, name) end def find_definition(namespace, name) - known_resource_types.find_or_load(namespace, name, :definition) + known_resource_types.find_definition(namespace, name) end def import(file) |