diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/resource/catalog.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/transaction.rb | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index 048920458..6aeda0957 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -158,7 +158,6 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph ensure @applying = false cleanup() - transaction.cleanup if defined? transaction and transaction end # Are we in the middle of applying the catalog? @@ -506,12 +505,6 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph private def cleanup - unless @transient_resources.empty? - remove_resource(*@transient_resources) - @transient_resources.clear - @relationship_graph = nil - end - # Expire any cached data the resources are keeping. expire() end diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index e9a193464..f8ed503d8 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -58,14 +58,6 @@ class Puppet::Transaction report.resource_statuses.values.find_all { |status| status.changed }.collect { |status| catalog.resource(status.resource) } end - # Do any necessary cleanup. If we don't get rid of the graphs, the - # contained resources might never get cleaned up. - def cleanup - if defined? @generated - catalog.remove_resource(*@generated) - end - end - # Copy an important relationships from the parent to the newly-generated # child resource. def make_parent_child_relationship(resource, children) |