diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-07 18:41:51 -0500 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-22 14:39:38 +1000 |
| commit | efe68165b382d6860e83b0bb1d1108f36fa3d2fd (patch) | |
| tree | 0144f344f2d0474f28aa055ecdc8b521249e251c /lib/puppet/parser/resource/param.rb | |
| parent | a3b1e8ce9c8ad97ed3bcf65c0554ae34690716fa (diff) | |
| download | puppet-efe68165b382d6860e83b0bb1d1108f36fa3d2fd.tar.gz puppet-efe68165b382d6860e83b0bb1d1108f36fa3d2fd.tar.xz puppet-efe68165b382d6860e83b0bb1d1108f36fa3d2fd.zip | |
Removing unnecessary parser variables when yaml-dumping
Also working around a YAML bug in Ruby.
And fixing tests that were broken in a previous commit
in this rebase but not caught earlier.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/parser/resource/param.rb')
| -rw-r--r-- | lib/puppet/parser/resource/param.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 6e22d3e17..0f791ecc5 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -1,4 +1,5 @@ require 'puppet/file_collection/lookup' +require 'puppet/parser/yaml_trimmer' # The parameters we stick in Resources. class Puppet::Parser::Resource::Param @@ -8,6 +9,7 @@ class Puppet::Parser::Resource::Param include Puppet::Util::MethodHelper include Puppet::FileCollection::Lookup + include Puppet::Parser::YamlTrimmer def initialize(hash) set_options(hash) @@ -16,7 +18,7 @@ class Puppet::Parser::Resource::Param end def inspect - "#<#{self.class} @name => #{name}, @value => #{value}, @source => #{source.name}, @line => #{line}>" + "#<#{self.class} @name => #{name}, @value => #{value}, @source => #{source.name if source}, @line => #{line}>" end def line_to_i |