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

Subject: [Boost-commit] svn:boost r79847 - trunk/tools/build/v2
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-02 06:45:25

Author: jurko
Date: 2012-08-02 06:45:25 EDT (Thu, 02 Aug 2012)
New Revision: 79847
URL: http://svn.boost.org/trac/boost/changeset/79847

Log:
Corrected Boost-Build's --debug-configuration notice displayed when not loading the site-config.jam configuration file due to the --ignore-site-config command-line option being specified.
Text files modified: 
   trunk/tools/build/v2/build-system.jam |     6 ++++++                                  
   trunk/tools/build/v2/build_system.py  |     2 +-                                      
   2 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam	(original)
+++ trunk/tools/build/v2/build-system.jam	2012-08-02 06:45:25 EDT (Thu, 02 Aug 2012)
@@ -342,6 +342,12 @@
         site-path = [ modules.peek : SystemRoot ] $(user-path) ;
     }
 
+    if $(.debug-config) && ! $(test-config) && $(ignore-site-config)
+    {
+        ECHO "notice: Site configuration files will be ignored due to the" ;
+        ECHO "notice: --ignore-site-config command-line option." ;
+    }
+
     initialize-config-module site-config ;
     if ! $(test-config) && ! $(ignore-site-config)
     {

Modified: trunk/tools/build/v2/build_system.py
==============================================================================
--- trunk/tools/build/v2/build_system.py	(original)
+++ trunk/tools/build/v2/build_system.py	2012-08-02 06:45:25 EDT (Thu, 02 Aug 2012)
@@ -264,7 +264,7 @@
     if os.name in ["nt"]:
         site_path = [os.getenv("SystemRoot")] + user_path
 
-    if ignore_site_config:
+    if debug_config and not test_config and ignore_site_config:
         print "notice: Site configuration files will be ignored due to the"
         print "notice: --ignore-site-config command-line option."