diff options
Diffstat (limited to 'lib/puppet/error.rb')
| -rw-r--r-- | lib/puppet/error.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/error.rb b/lib/puppet/error.rb index b70a4dddf..10ccf47be 100644 --- a/lib/puppet/error.rb +++ b/lib/puppet/error.rb @@ -22,12 +22,14 @@ module Puppet # :nodoc: def to_s str = nil - if defined? @file and defined? @line and @file and @line + if self.file and self.line str = "%s at %s:%s" % [@message.to_s, @file, @line] - elsif defined? @line and @line + elsif self.line str = "%s at line %s" % [@message.to_s, @line] + elsif self.file + str = "%s in %s" % [@message.to_s, self.file] else str = @message.to_s end |