In one corner, we have Luke's event patch (#2759); in the other,
Brice's checksum => none patch (#2929).  In the middle, the current
champion, the code from master.  So what should the final merged
result look like?

<<<<<<<
    def matching_edges(events, base = nil)
        events.inject([]) do |matching,event|
            source = base || event.source
            unless vertex?(source)
                Puppet.warning "Got an event from invalid vertex %s" %
source.ref
                next
            end
            # Get all of the edges that this vertex should forward events
            # to, which is the same thing as saying all edges directly below
            # This vertex in the graph.

            if wrapper = @vertices[source]
                wrapper.each_out_edges do |edge|
                    matching << edge if edge.match?(event.name)
                end
            end
            matching
        end
    end
|||||||
    def matching_edges(events, base = nil)
        events.collect do |event|
            source = base || event.source
            unless vertex?(source)
                Puppet.warning "Got an event from invalid vertex %s" %
source.ref
                next
            end
            # Get all of the edges that this vertex should forward events
            # to, which is the same thing as saying all edges directly below
            # This vertex in the graph.
            adjacent(source, :direction => :out, :type =>
:edges).find_all do |edge|
                edge.match?(event.name)
            end
        end.compact.flatten
    end
=======
    def matching_edges(event, base = nil)
        source = base || event.resource
        unless vertex?(source)
            Puppet.warning "Got an event from invalid vertex #{source.ref}"
            return []
        end
        # Get all of the edges that this vertex should forward events
        # to, which is the same thing as saying all edges directly below
        # This vertex in the graph.
        adjacent(source, :direction => :out, :type => :edges).find_all do |edge|
            edge.match?(event.name)
        end
    end
>>>>>>>



-- Markus

-----------------------------------------------------------
The power of accurate observation is
commonly called cynicism by those
who have not got it.  ~George Bernard Shaw
------------------------------------------------------------

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to puppet-...@googlegroups.com.
To unsubscribe from this group, send email to 
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to