diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-04-07 14:14:57 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-04-07 14:14:57 -0700 |
| commit | af792351a62399f8bbeba0d2425f2b88eabb3dff (patch) | |
| tree | 9f09aeb23ed34ece07c16acaeb769e3e36525f36 | |
| parent | fe45c2417af580597cd39adec96a30a05a7cd66a (diff) | |
| parent | 6be1eb89750593c63668827fcc6230747a03a3c0 (diff) | |
| download | puppet-af792351a62399f8bbeba0d2425f2b88eabb3dff.tar.gz puppet-af792351a62399f8bbeba0d2425f2b88eabb3dff.tar.xz puppet-af792351a62399f8bbeba0d2425f2b88eabb3dff.zip | |
Merge branch 'maint/next/load-order-bug-with-component' into next
| -rw-r--r-- | lib/puppet/transaction/event_manager.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/transaction/event_manager.rb b/lib/puppet/transaction/event_manager.rb index a21bbf892..f5da870ed 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 5ecc430d4..c0e5d390b 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) |