Commits

Gary Oberbrunner committed c5ee220 Merge

Merge fix for #2976, -s should be silent about entering subdirs.

Comments (0)

Files changed (3)

 
 RELEASE 2.X.X - 
 
+  From Mortoray:
+    - Make -s (silent mode) be silent about entering subdirs (#2976).
+
   From Gary Oberbrunner:
     - Show valid Visual Studio architectures in error message
        when user passes invalid arch.

src/engine/SCons/Script/Main.py

                 script_dir = ''
 
     if script_dir and script_dir != os.getcwd():
-        display("scons: Entering directory `%s'" % script_dir)
+        if not options.silent:
+            display("scons: Entering directory `%s'" % script_dir)
         try:
             os.chdir(script_dir)
         except OSError:
 test.fail_test(not os.path.exists(test.workpath('f1.out')))
 test.fail_test(not os.path.exists(test.workpath('f2.out')))
 
+# -C should also be quiet Issue#2796
+test.subdir( 'sub' )
+test.write(['sub','SConstruct'],"")
+test.run(arguments = '-s -C sub', stdout = "" )
+
 test.pass_test()