summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorballman <ballman@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 12:26:37 +0000
committerballman <ballman@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 12:26:37 +0000
commit469d999d257d3cbc3ce54cace9e1820233503a76 (patch)
treef0a55d4b4ac2fac33c6916813c0c3cca5a4d9a20
parent51b9fc125bee7d1d00923afdd801dc32b37e5b40 (diff)
downloadpuppet-469d999d257d3cbc3ce54cace9e1820233503a76.tar.gz
puppet-469d999d257d3cbc3ce54cace9e1820233503a76.tar.xz
puppet-469d999d257d3cbc3ce54cace9e1820233503a76.zip
Updated the CHANGELOG.
Fixed a bug where the false values of resource paramaeters were being deleted nd inserted alternately. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2583 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--CHANGELOG5
-rw-r--r--lib/puppet/parser/resource/param.rb10
2 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9ff97bf22..b93d3b3cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+ Reworked the idatbase schema used to store configurations with the
+ storeconfigs option.
+
Replaced the obsolete RRD ruby library with the maintained
RubyRRDtool library (which requires rrdtool2) (#659).
@@ -97,7 +100,7 @@
from Property. The retrieve methods now return the current value of
the property for the system.
- Rmoved acts_as_taggable from the rails models.
+ Removed acts_as_taggable from the rails models.
0.22.4
Execs now autorequire the user they run as, as long as the user
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index f7fbd01b9..4bd169bdd 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -1,4 +1,4 @@
-# The parameters we stick in Resources.
+ # The parameters we stick in Resources.
class Puppet::Parser::Resource::Param
attr_accessor :name, :value, :source, :line, :file
include Puppet::Util
@@ -56,18 +56,22 @@ class Puppet::Parser::Resource::Param
def values_to_remove(db_values)
values = value.is_a?(Array) ? value : [value]
+ values.map! { |v| v.to_s }
line_number = line_to_i()
db_values.collect do |db|
db unless (db.line == line_number &&
- values.find { |v| v.to_s == db.value } )
+ values.find { |v|
+ v == db.value
+ } )
end.compact
end
def values_to_add(db_values)
values = value.is_a?(Array) ? value : [value]
+ values.map! { |v| v.to_s }
line_number = line_to_i()
values.collect do |v|
- v unless db_values.find { |db| (v.to_s == db.value &&
+ v unless db_values.find { |db| (v == db.value &&
line_number == db.line) }
end.compact
end