summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-03-06 18:11:33 -0600
committerJames Turnbull <james@lovedthanlost.net>2009-03-07 11:20:51 +1100
commita3bb201bd4c964ab4f68e00895b692d9d9585407 (patch)
tree3dc414005f9b26a052efabebf738398b9793e265
parent67fc394d9ffaed89328c00678559f57418a1511d (diff)
downloadpuppet-a3bb201bd4c964ab4f68e00895b692d9d9585407.tar.gz
puppet-a3bb201bd4c964ab4f68e00895b692d9d9585407.tar.xz
puppet-a3bb201bd4c964ab4f68e00895b692d9d9585407.zip
Fixing change printing when list properties are absent
They were throwing an exception when the 'is' value was 'absent'. Signed-off-by: Luke Kanies <luke@madstop.com>
-rw-r--r--lib/puppet/property/list.rb6
-rw-r--r--spec/unit/property/list.rb4
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/property/list.rb b/lib/puppet/property/list.rb
index 0c933f164..b7db8b42a 100644
--- a/lib/puppet/property/list.rb
+++ b/lib/puppet/property/list.rb
@@ -10,7 +10,11 @@ module Puppet
end
def is_to_s(currentvalue)
- currentvalue.join(delimiter)
+ if currentvalue == :absent
+ return "absent"
+ else
+ return currentvalue.join(delimiter)
+ end
end
def membership
diff --git a/spec/unit/property/list.rb b/spec/unit/property/list.rb
index 2fab868db..854ab4874 100644
--- a/spec/unit/property/list.rb
+++ b/spec/unit/property/list.rb
@@ -36,6 +36,10 @@ describe list_class do
@property.is_to_s(["foo","bar"]).should == "foo,bar"
end
+ it "should be able to correctly convert ':absent' to a string" do
+ @property.is_to_s(:absent).should == "absent"
+ end
+
describe "when adding should to current" do
it "should add the arrays when current is an array" do
@property.add_should_with_current(["foo"], ["bar"]).should == ["foo", "bar"]