diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-27 13:09:30 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-27 13:09:30 -0700 |
| commit | ac0581f16ca17962a23c244424d83dbd6e721479 (patch) | |
| tree | 7324e202c6595750be76ce3f33ed04c945f3df7e /lib/puppet | |
| parent | 74498afecdc0a64f9435ef20065e08d549a510c9 (diff) | |
| download | puppet-ac0581f16ca17962a23c244424d83dbd6e721479.tar.gz puppet-ac0581f16ca17962a23c244424d83dbd6e721479.tar.xz puppet-ac0581f16ca17962a23c244424d83dbd6e721479.zip | |
(#7101) Fix template error messages in Ruby 1.8.5
lib/puppet/parser/templatewrapper.rb#script_line was calling .first on a
String object, which in Ruby > 1.8.5 will return the entire string, but
in 1.8.5 will cause an exception. This change (proposed by Markus
Roberts) removes the call to .first and adds a condition for when the
template error involves the file not being found.
Reviewed-by: Jesse Wolfe
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/parser/templatewrapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb index 180a03dc9..27d75bf92 100644 --- a/lib/puppet/parser/templatewrapper.rb +++ b/lib/puppet/parser/templatewrapper.rb @@ -20,7 +20,7 @@ class Puppet::Parser::TemplateWrapper def script_line # find which line in the template (if any) we were called from - caller.find { |l| l =~ /#{file}:/ }.first[/:(\d+):/,1] + (caller.find { |l| l =~ /#{file}:/ }||"")[/:(\d+):/,1] end # Should return true if a variable is defined, false if it is not |