summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transaction.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-17 20:57:24 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-17 20:57:24 +0000
commit8410c4dc5bfbb450ea740be42e0f0d712bf86e7a (patch)
tree27104d22c9b3d064d08379526107ccd312400d19 /lib/puppet/transaction.rb
parent67ee2510834e576b20a82a0692fab2b2332a85c1 (diff)
downloadpuppet-8410c4dc5bfbb450ea740be42e0f0d712bf86e7a.tar.gz
puppet-8410c4dc5bfbb450ea740be42e0f0d712bf86e7a.tar.xz
puppet-8410c4dc5bfbb450ea740be42e0f0d712bf86e7a.zip
Fixing #507 (behaviour in cycles) by changing the topsort algorithm.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2521 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/transaction.rb')
-rw-r--r--lib/puppet/transaction.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 86d4bfc6e..7c046c898 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -497,10 +497,8 @@ class Transaction
# Create a relationship graph from our resource graph
@relgraph = relationship_graph
+ # This will throw an error if there are cycles in the 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.