Undoing the merge that happened in 785

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@786 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/puppet/event.rb b/lib/puppet/event.rb
index a7070bb3e..e2c364194 100644
--- a/lib/puppet/event.rb
+++ b/lib/puppet/event.rb
@@ -192,7 +192,7 @@ module Puppet
                 end
 
                 if transaction.triggered?(self.target, @callback) > 0
-                    self.target.info "already applied %s" % [@callback]
+                    Puppet.debug "%s has already run" % self
                 else
                     # We need to call the method, so that it gets retrieved
                     # as a real object.
@@ -201,7 +201,6 @@ module Puppet
                     #    [@source,@event,@method,target]
                     begin
                         if target.respond_to?(@callback)
-                            target.log "triggering %s" % @callback
                             event = target.send(@callback)
                         else
                             Puppet.debug(   
@@ -241,6 +240,14 @@ module Puppet
 			@event = args[:event]
 			@source = args[:source]
 			@transaction = args[:transaction]
+
+            #Puppet.info "%s: %s(%s)" %
+            #Puppet.info "%s: %s changed from %s to %s" %
+            #    [@object,@state.name, @state.is,@state.should]
+
+            # initially, just stuff all instances into a central bucket
+            # to be handled as a batch
+            #@@events.push self
 		end
 
         def to_s