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

From: jurko.gospodnetic_at_[hidden]
Date: 2008-07-12 07:43:55

Author: jurko
Date: 2008-07-12 07:43:54 EDT (Sat, 12 Jul 2008)
New Revision: 47347
URL: http://svn.boost.org/trac/boost/changeset/47347

Log:
Fixed a bug wit Boost Build ignoring conditional properties specified in addition to a conditional subfeature property. This fixes the problem with the conditionals_multiple.py test case failing.
Text files modified: 
   trunk/tools/build/v2/build/property.jam |     3 +--                                     
   1 files changed, 1 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/build/property.jam
==============================================================================
--- trunk/tools/build/v2/build/property.jam	(original)
+++ trunk/tools/build/v2/build/property.jam	2008-07-12 07:43:54 EDT (Sat, 12 Jul 2008)
@@ -159,8 +159,7 @@
             }
             else
             {
-                local individual-subfeatures = [ set.difference $(e) : $(condition) ] ;
-                result += $(individual-subfeatures:J=,):$(value) ;
+                result += $(e:J=,):$(value) ;
             }
         }
     }