[Boost-commit] svn:boost r64536 - trunk/tools/build/v2/build

Subject: [Boost-commit] svn:boost r64536 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-08-02 06:07:45

Author: vladimir_prus
Date: 2010-08-02 06:07:43 EDT (Mon, 02 Aug 2010)
New Revision: 64536
URL: http://svn.boost.org/trac/boost/changeset/64536

Log:
Update build/feature.py.

Text files modified: 
   trunk/tools/build/v2/build/feature.py |    12 ++++--------                            
   1 files changed, 4 insertions(+), 8 deletions(-)

Modified: trunk/tools/build/v2/build/feature.py
==============================================================================
--- trunk/tools/build/v2/build/feature.py	(original)
+++ trunk/tools/build/v2/build/feature.py	2010-08-02 06:07:43 EDT (Mon, 02 Aug 2010)
@@ -1,6 +1,5 @@
-# Status: mostly ported.
-# TODO: carry over tests.
-# Base revision: 56043
+# Status: ported, except for unit tests.
+# Base revision: 64488
 #
 # Copyright 2001, 2002, 2003 Dave Abrahams 
 # Copyright 2002, 2006 Rene Rivera 
@@ -8,10 +7,6 @@
 # Distributed under the Boost Software License, Version 1.0. 
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
-# TODO: stop using grists to identify the name of features?
-#       create a class for Features and Properties?
-#       represent conditions using object trees, composite pattern?
-
 import re
 
 from b2.util import utility, bjam_signature
@@ -438,7 +433,8 @@
     values = [value_string]
 
     if f.subfeatures():
-        if not value_string in f.subfeatures():
+        if not value_string in f.values() and \
+               not value_string in f.subfeatures():
             values = value_string.split('-')
 
     # An empty value is allowed for optional features