diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-05-12 19:55:18 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-05-12 19:55:18 (GMT) |
| commit | f011342d8018a0cd8ef18de017d84a12cd157f6d (patch) | |
| tree | 000d8d458870a4e43bb8f7a22e23c22c37b53733 /src | |
| parent | eb778e1cbec002b502d3f2dc5043e2b039af29e7 (diff) | |
| parent | 70ca48f0389de490a0f6582aa161b30986af3532 (diff) | |
| download | SCons-f011342d8018a0cd8ef18de017d84a12cd157f6d.zip SCons-f011342d8018a0cd8ef18de017d84a12cd157f6d.tar.gz SCons-f011342d8018a0cd8ef18de017d84a12cd157f6d.tar.bz2 | |
Merge fix for #2976, -s should be silent about entering subdirs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 3 |
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: |