summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node/catalog.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-11 18:27:49 -0600
committerLuke Kanies <luke@madstop.com>2008-02-11 18:27:49 -0600
commit8b2fae019b31513becd002eb474e1b4803abde24 (patch)
tree92312a50927ff65a8b78fbec7fff52d3bf59eb78 /lib/puppet/node/catalog.rb
parentcf21ade9abf4541920b535b0e2643b30e44b067b (diff)
downloadpuppet-8b2fae019b31513becd002eb474e1b4803abde24.tar.gz
puppet-8b2fae019b31513becd002eb474e1b4803abde24.tar.xz
puppet-8b2fae019b31513becd002eb474e1b4803abde24.zip
Removing the last remaining vestiges of GRATR --
removing the bangs from 'add_vertex!' and 'add_edge!'.
Diffstat (limited to 'lib/puppet/node/catalog.rb')
-rw-r--r--lib/puppet/node/catalog.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index 96f60b179..b74947107 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -69,7 +69,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
@resource_table[ref] = resource
resource.catalog = self if resource.respond_to?(:catalog=) and ! is_relationship_graph
- add_vertex!(resource)
+ add_vertex(resource)
end
end
@@ -316,9 +316,9 @@ class Puppet::Node::Catalog < Puppet::PGraph
# First create the dependency graph
self.vertices.each do |vertex|
- @relationship_graph.add_vertex! vertex
+ @relationship_graph.add_vertex vertex
vertex.builddepends.each do |edge|
- @relationship_graph.add_edge!(edge)
+ @relationship_graph.add_edge(edge)
end
end
@@ -328,7 +328,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
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)
+ @relationship_graph.add_edge(edge)
else
vertex.debug "Skipping automatic relationship with %s" % (edge.source == vertex ? edge.target : edge.source)
end
@@ -487,7 +487,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
raise Puppet::DevError, "Could not find resource %s when converting %s resources" % [edge.target.ref, message]
end
- result.add_edge!(source, target, edge.label)
+ result.add_edge(source, target, edge.label)
end
map.clear