From 59212913f9b3ecb05ffd13d79316042be7a5da93 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 21 Jul 2003 05:16:47 +0000
Subject: [PATCH] Improve error message.

[SVN r19237]
---
 new/feature.jam      | 3 ++-
 v2/build/feature.jam | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/new/feature.jam b/new/feature.jam
index 6bb55ae1f..f681cddc8 100644
--- a/new/feature.jam
+++ b/new/feature.jam
@@ -629,7 +629,8 @@ rule expand-composites ( properties * )
                 {
                     error explicitly-specified values of non-free feature
                       $(f) conflict :
-                        values: [ get-values $(f) : $(properties) ] $(x:G=) ;
+                        "existing values:" [ get-values $(f) : $(properties) ] :
+                        "value from expanding " $(p) ":" (x:G=) ;
                 }
                 else
                 {
diff --git a/v2/build/feature.jam b/v2/build/feature.jam
index 6bb55ae1f..f681cddc8 100644
--- a/v2/build/feature.jam
+++ b/v2/build/feature.jam
@@ -629,7 +629,8 @@ rule expand-composites ( properties * )
                 {
                     error explicitly-specified values of non-free feature
                       $(f) conflict :
-                        values: [ get-values $(f) : $(properties) ] $(x:G=) ;
+                        "existing values:" [ get-values $(f) : $(properties) ] :
+                        "value from expanding " $(p) ":" (x:G=) ;
                 }
                 else
                 {