diff options
| author | Markus Roberts <Markus@reality.com> | 2010-07-16 17:51:42 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-18 19:44:10 -0700 |
| commit | 680dd1ace4b616908d76539befcbdf03feb1cef9 (patch) | |
| tree | 8868ac70f4d2d0b58349757a0c96a43981bd6445 /lib/puppet | |
| parent | 6e07a199011b434ea6d7b3c69d14e6ca7cf9cf8e (diff) | |
| download | puppet-680dd1ace4b616908d76539befcbdf03feb1cef9.tar.gz puppet-680dd1ace4b616908d76539befcbdf03feb1cef9.tar.xz puppet-680dd1ace4b616908d76539befcbdf03feb1cef9.zip | |
Fix for #4257 -- problems resolving ::-prefixed classes
While find_fully_qualified expects (and gets) fully qualified class names it
does not always get absolute names (with the ::-prefix); test in the global
scope refers to the same thing as ::test.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/resource/type_collection.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb index 58e8b9497..9ed27332d 100644 --- a/lib/puppet/resource/type_collection.rb +++ b/lib/puppet/resource/type_collection.rb @@ -198,11 +198,7 @@ class Puppet::Resource::TypeCollection private def find_fully_qualified(name, type) - return nil unless name =~ /^::/ - - name = name.sub(/^::/, '') - - send(type, name) + send(type, name.sub(/^::/, '')) end def find_partially_qualified(namespace, name, type) |