summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Script/Main.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:30:35 +0200
committerLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:30:35 +0200
commit82c4addb364fffb1c647ff7e5fab201000719305 (patch)
treecc244c59579c58d9e8df6e157d8fc49510e0f494 /src/engine/SCons/Script/Main.py
parentfa0c16e75fd6770db0a9eb67a37a9b420ba3fa4f (diff)
parent3d529f4ea2b0de42aa2144dbe904e564b7b0b813 (diff)
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'src/engine/SCons/Script/Main.py')
-rw-r--r--src/engine/SCons/Script/Main.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 2f00e5c..12d1bc2 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -13,7 +13,7 @@ it goes here.
unsupported_python_version = (2, 3, 0)
deprecated_python_version = (2, 4, 0)
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 4, 0)
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Script/Main.py 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "src/engine/SCons/Script/Main.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import SCons.compat
@@ -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:
@@ -1329,7 +1330,7 @@ def main():
pass
parts.append(version_string("engine", SCons))
parts.append(path_string("engine", SCons))
- parts.append("Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation")
+ parts.append("Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation")
version = ''.join(parts)
import SConsOptions