diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-17 01:08:53 -0500 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-17 16:17:58 +1000 |
| commit | 7ab7d9f9ff378041ab7a2baf159860439bd1c812 (patch) | |
| tree | a6ea8eb9eb8f2b021206e79f53e2a97e8a0c90f1 /lib/puppet/resource.rb | |
| parent | 84e6c1bd95f32810e92eb760fe3f3f9efdb84f04 (diff) | |
| download | puppet-7ab7d9f9ff378041ab7a2baf159860439bd1c812.tar.gz puppet-7ab7d9f9ff378041ab7a2baf159860439bd1c812.tar.xz puppet-7ab7d9f9ff378041ab7a2baf159860439bd1c812.zip | |
Fixing #2112 - Transactions handle conflicting generated resources
This commit rips out all of the 'implicit resource' crap,
replacing it with a simple system that just skips
resources that the catalog says are in conflict.
Removes a bunch of code, and fixes the bug to boot.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/resource.rb')
| -rw-r--r-- | lib/puppet/resource.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index add32b7cf..50663cb67 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -7,7 +7,7 @@ require 'puppet/resource/reference' class Puppet::Resource include Puppet::Util::Tagging include Enumerable - attr_accessor :type, :title, :file, :line, :catalog, :implicit + attr_accessor :type, :title, :file, :line, :catalog # Proxy these methods to the parameters hash. It's likely they'll # be overridden at some point, but this works for now. |