From 703047bca136dffba2dcc4fd59d13256bf0198b3 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 23 Jun 2004 10:56:34 +0000
Subject: [PATCH] (register-actual-name) Always generate verbose error message.
 Also, fix a typo which caused the same location to be reported for both
 targets.

[SVN r23168]
---
 v2/build/virtual-target.jam | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/v2/build/virtual-target.jam b/v2/build/virtual-target.jam
index 20e51663b..6866c24c9 100644
--- a/v2/build/virtual-target.jam
+++ b/v2/build/virtual-target.jam
@@ -795,7 +795,7 @@ rule register-actual-name ( actual-name : virtual-target )
         local cs1 = [ $(.actual.$(actual-name)).creating-subvariant ] ;
         local cs2 = [ $(virtual-target).creating-subvariant ] ;
         local cmt1 = [ $(cs1).main-target ] ;
-        local cmt2 = [ $(cs1).main-target ] ;
+        local cmt2 = [ $(cs2).main-target ] ;
         
         
         local action1 = [ $(.actual.$(actual-name)).action ] ;
@@ -813,22 +813,13 @@ rule register-actual-name ( actual-name : virtual-target )
             properties-added = [ set.difference $(p2) : $(p1) ] ;
             properties-added ?= "none" ;
         }        
-        if $(properties-added) != "none" || $(properties-removed) != "none"
-        {            
-            errors.error "Duplicate name of actual target:" $(actual-name) 
-              : "previous virtual target" [ $(.actual.$(actual-name)).str ] 
-              : "created from" [ $(cmt1).location ]
-              : "another virtual target" [ $(virtual-target).str ]
-              : "created from" [ $(cmt2).location ]                
-              : "added properties: " $(properties-added) 
-              : "removed properties: " $(properties-removed) ;
-        }
-        else
-        {
-            errors.error "Duplicate name of actual target:" $(actual-name) 
-              : "previous virtual target" [ $(.actual.$(actual-name)).str ] 
-              : "another virtual target" [ $(virtual-target).str ] ;            
-        }        
+        errors.error "Duplicate name of actual target:" $(actual-name) 
+          : "previous virtual target" [ $(.actual.$(actual-name)).str ] 
+          : "created from" [ $(cmt1).location ]
+          : "another virtual target" [ $(virtual-target).str ]
+          : "created from" [ $(cmt2).location ]                
+          : "added properties: " $(properties-added) 
+          : "removed properties: " $(properties-removed) ;
     }
     else
     {