summaryrefslogtreecommitdiffstats
path: root/lib/puppet/rails/resource.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2009-12-21 22:59:23 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-12-23 09:52:02 +1100
commit49530adaaa302c4b4e3b9eefb05e9551503a0ba6 (patch)
tree56cb85214c186e4c802492a97757a7874e857d12 /lib/puppet/rails/resource.rb
parent6ab2453d966d1d48e12d8a8cec34b9e460597d04 (diff)
downloadpuppet-49530adaaa302c4b4e3b9eefb05e9551503a0ba6.tar.gz
puppet-49530adaaa302c4b4e3b9eefb05e9551503a0ba6.tar.xz
puppet-49530adaaa302c4b4e3b9eefb05e9551503a0ba6.zip
Fixing #2964 updated resources cannot be collected until they are exported twice
This logic had a bug where it would not insert data if it had just been deleted. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/rails/resource.rb')
-rw-r--r--lib/puppet/rails/resource.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index be28e377f..7b37a52bf 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -148,7 +148,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base
# Lastly, add any new parameters.
catalog_params.each do |name, value|
- next if db_params.include?(name)
+ next if db_params.include?(name) && ! db_params[name].find{ |val| deletions.include?( val["id"] ) }
values = value.is_a?(Array) ? value : [value]
values.each do |v|