diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/transaction.rb | 10 | ||||
| -rw-r--r-- | lib/puppet/transportable.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/type.rb | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 1efd21de5..2b8d93bbf 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -75,13 +75,13 @@ class Transaction event.nil? } - @triggerevents = [] + #@triggerevents = [] events.each { |event| object = event.source object.propagate(event) } - events += @triggerevents + #events += @triggerevents end #--------------------------------------------------------------- @@ -142,20 +142,20 @@ class Transaction end }.flatten.reject { |e| e.nil? } - @triggerevents = [] + #@triggerevents = [] events.each { |event| object = event.source object.propagate(event) } - events += @triggerevents + #events += @triggerevents end #--------------------------------------------------------------- #--------------------------------------------------------------- def triggered(object, method) @triggered[object][method] += 1 - @triggerevents << ("%s_%sed" % [object.class.name.to_s, method.to_s]).intern + #@triggerevents << ("%s_%sed" % [object.class.name.to_s, method.to_s]).intern end #--------------------------------------------------------------- diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb index f3a701130..046522ca2 100644 --- a/lib/puppet/transportable.rb +++ b/lib/puppet/transportable.rb @@ -57,17 +57,15 @@ module Puppet rescue => detail # FIXME TransObject should be handling what happens when there's an error if Puppet[:debug] - puts self.inspect if detail.respond_to?(:stack) puts detail.stack end end + Puppet.err "Could not create %s: %s" % [self[:name], detail.to_s] if retobj - Puppet.err "Destroying %s" % self[:name] retobj.destroy() else if obj = type[self[:name]] - Puppet.err "Destroying retrieved %s" % self[:name] obj.destroy() end end diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index befaaa4cd..b9ddec44f 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -843,7 +843,7 @@ class Type < Puppet::Element ! (event.is_a?(Symbol) or event.is_a?(String)) }.flatten - Puppet.notice "got events %s" % events.inspect + #Puppet.notice "got events %s" % events.inspect Puppet::Metric.addevents(self.class,self,events) return events |