Rasing exceptions, expanding the path for the source line

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index afd7163a43..436906557c 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -44,7 +44,7 @@ class Chef
       @allowed_actions = [ :nothing ]
       @action = :nothing
       @updated = false
-      @source_line = caller(4).shift.gsub!(/^(.+):(.+):.+$/, '\1 line \2')
+      @source_line = ::File.expand_path(caller(4).shift.gsub!(/^(.+):(.+):.+$/, '\1 line \2'))
     end
     
     def action(arg=nil)
diff --git a/lib/chef/runner.rb b/lib/chef/runner.rb
index cd2126494a..969f42b4e3 100644
--- a/lib/chef/runner.rb
+++ b/lib/chef/runner.rb
@@ -80,8 +80,8 @@ class Chef
               end
             end
           end
-        rescue Exception => e
-          Chef::Log.error("#{resource} (#{resource.source_line} had an error:")
+        rescue 
+          Chef::Log.error("#{resource} (#{resource.source_line}) had an error:")
           raise e
         end
       end