Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r65241 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-09-04 08:27:39


Author: vladimir_prus
Date: 2010-09-04 08:27:39 EDT (Sat, 04 Sep 2010)
New Revision: 65241
URL: http://svn.boost.org/trac/boost/changeset/65241

Log:
Unbreak project loading in python port
Text files modified:
   trunk/tools/build/v2/build/project.py | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/build/project.py
==============================================================================
--- trunk/tools/build/v2/build/project.py (original)
+++ trunk/tools/build/v2/build/project.py 2010-09-04 08:27:39 EDT (Sat, 04 Sep 2010)
@@ -313,15 +313,13 @@
         if not dir:
             dir = "."
 
- saved_project = self.current_project
-
         self.used_projects[jamfile_module] = []
         
         # Now load the Jamfile in it's own context.
         # The call to 'initialize' may load parent Jamfile, which might have
         # 'use-project' statement that causes a second attempt to load the
         # same project we're loading now. Checking inside .jamfile-modules
- # prevents that second attempt from messing up.
+ # prevents that second attempt from messing up.
         if not jamfile_module in self.jamfile_modules:
             self.jamfile_modules[jamfile_module] = True
 
@@ -329,6 +327,8 @@
             #
             self.initialize(jamfile_module, dir, os.path.basename(jamfile_to_load))
 
+ saved_project = self.current_project
+
             bjam.call("load", jamfile_module, jamfile_to_load)
             basename = os.path.basename(jamfile_to_load)
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk