diff options
Diffstat (limited to 'lib/puppet/error.rb')
| -rw-r--r-- | lib/puppet/error.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/puppet/error.rb b/lib/puppet/error.rb index 971b31116..66c4f19a6 100644 --- a/lib/puppet/error.rb +++ b/lib/puppet/error.rb @@ -6,7 +6,7 @@ module Puppet # :nodoc: attr_accessor :line, :file def backtrace - if defined? @backtrace + if defined?(@backtrace) return @backtrace else return super @@ -23,11 +23,9 @@ module Puppet # :nodoc: def to_s str = nil if self.file and self.line - str = "%s at %s:%s" % - [@message.to_s, @file, @line] + str = "%s at %s:%s" % [@message.to_s, @file, @line] elsif self.line - str = "%s at line %s" % - [@message.to_s, @line] + str = "%s at line %s" % [@message.to_s, @line] elsif self.file str = "%s in %s" % [@message.to_s, self.file] else |