[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-663-g71824ee

Markus Roberts Markus at reality.com
Tue Jul 20 07:42:26 UTC 2010


The following commit has been merged in the upstream branch:
commit 680dd1ace4b616908d76539befcbdf03feb1cef9
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Jul 16 17:51:42 2010 -0700

    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.

diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb
index 58e8b94..9ed2733 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)

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list