From 5060ca2bcb7bc0c9ef075d23cd44da03e92c1d06 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Thu, 13 Nov 2008 07:07:10 +0000
Subject: [PATCH] Improve error message

[SVN r49710]
---
 v2/build/property.jam | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2/build/property.jam b/v2/build/property.jam
index 5ee66af32..b42dd34fd 100644
--- a/v2/build/property.jam
+++ b/v2/build/property.jam
@@ -609,8 +609,8 @@ class property-map
         local best = [ sequence.select-highest-ranked $(matches)
             : $(match-ranks) ] ;
         if $(best[2])
-        {
-            errors.error "Ambiguous key" ;
+        {            
+            errors.error "Ambiguous key" $(properties) ;
         }
         local original = $(self.value.$(best)) ;
         if $(value)
@@ -736,7 +736,7 @@ rule __test__ ( )
 
     try ;
         $(pm).find <toolset>gcc <os>NT <os>CYGWIN ;
-    catch "Ambiguous key" ;
+    catch "Ambiguous key <toolset>gcc <os>NT <os>CYGWIN" ;
 
     # Test ordinary properties.
     assert.result : split-conditional <toolset>gcc ;