making changes necessary to pass tests on all available platforms

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

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index af633e6b7..99ab48860 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -24,7 +24,12 @@ module Puppet
         end
 
         def to_s
-            return @message
+            if @file and @line
+                return "%s at file %s, line %s" %
+                    [@message, @file, @line]
+            else
+                return @message
+            end
         end
     end