summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Script/Main.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a2690c8..cbaffb3 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,9 @@
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.
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 0e029b5..bcb013e 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -869,7 +869,8 @@ def _main(parser):
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: