summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transaction.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-27 20:34:32 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-27 20:34:32 +0000
commita3f36748528ea760b5965f972941c6022d0449e9 (patch)
treed4964f917a6c018d543201a18b21303ee54740c9 /lib/puppet/transaction.rb
parent1a7d8b6715b6dfb55be7a0e36442af4d04e46954 (diff)
downloadpuppet-a3f36748528ea760b5965f972941c6022d0449e9.tar.gz
puppet-a3f36748528ea760b5965f972941c6022d0449e9.tar.xz
puppet-a3f36748528ea760b5965f972941c6022d0449e9.zip
Redoing some aspects of the graphing in hopes of helping hte performance a bit.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2230 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/transaction.rb')
-rw-r--r--lib/puppet/transaction.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 43ee135a6..2a83ea630 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -474,6 +474,9 @@ class Transaction
@relgraph = relationship_graph
@sorted_resources = @relgraph.topsort
+
+ # Now make sure no cycles crept into our graph.
+ @relgraph.check_cycle(@sorted_resources)
end
# Create a graph of all of the relationships in our resource graph.
@@ -507,8 +510,6 @@ class Transaction
# Then splice in the container information
graph.splice!(@resources, Puppet::Type::Component)
- graph.check_cycle
-
graph(graph, :expanded_relationships)
return graph