From 065a1d0281ba326674e37a00d8ced1e3a2dd57e4 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Wed, 7 Nov 2007 17:48:50 -0600
Subject: Switching the graph base class from GRATR::Digraph to
 Puppet::SimpleGraph, which should dramatically enhance performance.  It
 should be largely functionally equivalent, with the only difference being
 that edges are no longer deduplicated.

---
 lib/puppet/node/configuration.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/node')

diff --git a/lib/puppet/node/configuration.rb b/lib/puppet/node/configuration.rb
index 1365767b6..e49090d70 100644
--- a/lib/puppet/node/configuration.rb
+++ b/lib/puppet/node/configuration.rb
@@ -83,6 +83,7 @@ class Puppet::Node::Configuration < Puppet::PGraph
 
         transaction.addtimes :config_retrieval => @retrieval_duration
 
+
         begin
             transaction.evaluate
         rescue Puppet::Error => detail
@@ -304,7 +305,7 @@ class Puppet::Node::Configuration < Puppet::PGraph
             # Lastly, add in any autorequires
             @relationship_graph.vertices.each do |vertex|
                 vertex.autorequire.each do |edge|
-                    unless @relationship_graph.edge?(edge)
+                    unless @relationship_graph.edge?(edge.source, edge.target) # don't let automatic relationships conflict with manual ones.
                         unless @relationship_graph.edge?(edge.target, edge.source)
                             vertex.debug "Autorequiring %s" % [edge.source]
                             @relationship_graph.add_edge!(edge)
-- 
cgit