From 0390385d2e9dafe660dc9714caf582ec36ba3db9 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Tue, 13 Dec 2011 00:03:38 +0000
Subject: [PATCH] Restore the original BACKTRACE behavior that I inadvertently
 changed.

[SVN r75929]
---
 v2/engine/compile.c            | 1 -
 v2/test/core-language/test.jam | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/v2/engine/compile.c b/v2/engine/compile.c
index 161cfd73e..198c6d473 100644
--- a/v2/engine/compile.c
+++ b/v2/engine/compile.c
@@ -500,7 +500,6 @@ evaluate_rule(
     module_t      * prev_module = frame->module;
 
     rule = bindrule( rulename, frame->module );
-    rulename = rule->name;
 
 #ifdef HAVE_PYTHON
     if ( rule->python_function )
diff --git a/v2/test/core-language/test.jam b/v2/test/core-language/test.jam
index 9c94dc4b1..d0f493f8e 100644
--- a/v2/test/core-language/test.jam
+++ b/v2/test/core-language/test.jam
@@ -1125,8 +1125,8 @@ check-equal while-result : [ test-rule ] : x ;
         local bt = [ BACKTRACE ] ;
         check-equal backtrace-1-file : $(bt) :
             test.jam [ CALC $(base) +  4 ] ""       backtrace
-            test.jam [ CALC $(base) + 28 ] module2. f
-            test.jam [ CALC $(base) + 19 ] module1. f
+            test.jam [ CALC $(base) + 28 ] module2. module2.f
+            test.jam [ CALC $(base) + 19 ] module1. module1.f
             test.jam [ CALC $(base) + 32 ] ""       "module scope"
         ;
     }