sup

commit 64eb5abdc3fc0f9b1254a5c4f45d35d786da89ac
parent 0eee0973223b625b66e30c196ccd45d2f7bf358b
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue,  6 Oct 2009 13:28:39 -0400

Merge branch 'master' into next

Diffstat:

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/sup/hook.rb b/lib/sup/hook.rb
@@ -78,10 +78,11 @@ class HookManager
     context = @contexts[hook] ||= HookContext.new(name)
 
     result = nil
+    fn = fn_for name
     begin
-      result = context.__run hook, fn_for(name), locals
+      result = context.__run hook, fn, locals
     rescue Exception => e
-      log "error running hook: #{e.message}"
+      log "error running #{fn}: #{e.message}"
       log e.backtrace.join("\n")
       @hooks[name] = nil # disable it
       BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?