fixing error output

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@513 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 12 insertions, 2 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index 0958d0240..d499e7596 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -24,12 +24,22 @@ module Puppet
         end
 
         def to_s
+            str = nil
             if defined? @file and defined? @line
-                return "%s at file %s, line %s" %
+                str = "%s at file %s, line %s" %
                     [@message, @file, @line]
+            elsif defined? @line
+                str = "%s at line %s" %
+                    [@message, @line]
             else
-                return @message
+                str = @message
             end
+
+            if Puppet[:debug] and @stack
+                str += @stack
+            end
+
+            return str
         end
     end