[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Jesse Wolfe]

The following commit has been merged in the experimental branch:
commit 6be1eb89750593c63668827fcc6230747a03a3c0
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Apr 7 14:06:18 2011 -0700

    Maint: fix a load order problem with type(:component)
    
    Puppet's autoloader has an incompatibility with ruby's native 'require'
    statement that makes it possible to reach the same code multiple times,
    which can cause genclass to create multiple classes with the same name.
    This patch fixes the uses of some puppet types so that they are loaded
    using the autoloader instead of using 'require'.
    
    Paired-With: Jacob Helwig <jacob at puppetlabs.com>

diff --git a/lib/puppet/transaction/event_manager.rb b/lib/puppet/transaction/event_manager.rb
index a21bbf8..f5da870 100644
--- a/lib/puppet/transaction/event_manager.rb
+++ b/lib/puppet/transaction/event_manager.rb
@@ -49,7 +49,7 @@ class Puppet::Transaction::EventManager
       # since eval_generated children can't have direct relationships.
       received = (event.name != :restarted)
       relationship_graph.matching_edges(event, resource).each do |edge|
-        received ||= true unless edge.target.is_a?(Puppet::Type::Whit)
+        received ||= true unless edge.target.is_a?(Puppet::Type.type(:whit))
         next unless method = edge.callback
         next unless edge.target.respond_to?(method)
 
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 5ecc430..c0e5d39 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1901,4 +1901,4 @@ end
 require 'puppet/provider'
 
 # Always load these types.
-require 'puppet/type/component'
+Puppet::Type.type(:component)

-- 
Puppet packaging for Debian