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

Subject: [Boost-commit] svn:boost r75033 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2011-10-18 04:58:44

Author: vladimir_prus
Date: 2011-10-18 04:58:42 EDT (Tue, 18 Oct 2011)
New Revision: 75033
URL: http://svn.boost.org/trac/boost/changeset/75033

Log:
Fix generators.override in Python port.

Text files modified: 
   trunk/tools/build/v2/build/generators.py |    14 ++++----------                          
   1 files changed, 4 insertions(+), 10 deletions(-)

Modified: trunk/tools/build/v2/build/generators.py
==============================================================================
--- trunk/tools/build/v2/build/generators.py	(original)
+++ trunk/tools/build/v2/build/generators.py	2011-10-18 04:58:42 EDT (Tue, 18 Oct 2011)
@@ -692,7 +692,7 @@
     after computing the list of viable generators, before
     running any of them."""
     
-    __overrides.get(overrider_id, []).append(overridee_id)
+    __overrides.setdefault(overrider_id, []).append(overridee_id)
 
 def __viable_source_types_real (target_type):
     """ Returns a list of source type which can possibly be converted
@@ -974,7 +974,7 @@
     
     # Generators which are overriden
     overriden_ids = [] 
-       
+
     for g in viable_generators:
         id = g.id ()
         
@@ -988,13 +988,7 @@
     if all_overrides:
         viable_generators = all_overrides
 
-    result = []
-    for g in viable_generators:
-        if not g.id () in overriden_ids:
-            result.append (g)
-
-        
-    return result
+    return [g for g in viable_generators if not g.id() in overriden_ids]
     
 def __construct_really (project, name, target_type, prop_set, sources):
     """ Attempts to construct target by finding viable generators, running them
@@ -1004,7 +998,7 @@
                     
     result = []
 
-    project.manager ().logger ().log (__name__, "*** %d viable generators" % len (viable_generators))
+    dout("      *** %d viable generators" % len (viable_generators))
 
     generators_that_succeeded = []