Fix the Entering

git-svn-id: http://scons.tigris.org/svn/scons/trunk@655 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 10cf7b36614b948d30dd26280431cf71d2876ecb..dba2c7ce882a16bac6deb8cc2fcc562675ec824a 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -61,6 +61,10 @@ RELEASE 0.14 - XXX
     to {Target,Source}Signatures().  Deprecate the old names but support
     them for backwards compatibility.
 
+  From Damyan Pepper:
+
+  - Quote the "Entering directory" message like Make.
+
   From Stefan Reichor:
 
   - Add support for using Ghostscript to convert Postscript to PDF files.

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index d2c60aa45bcf00b22e7a8f384e5c7ea58da31792..d67b94985712ff7e8c58e9a81aba439e0432cc77 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -720,7 +720,7 @@ def _main():
             else:
                 script_dir = ''
         if script_dir:
-            display("scons: Entering directory %s" % script_dir)
+            display("scons: Entering directory `%s'" % script_dir)
             os.chdir(script_dir)
         else:
             raise SCons.Errors.UserError, "No SConstruct file found."

diff --git a/test/option-u.py b/test/option-u.py
index 9cb00550145dad75020203ca85046b39d704d000..2b2ad4fa17c8f3cde610b3f6ecf9bf67ceff4669 100644 (file)
--- a/test/option-u.py
+++ b/test/option-u.py
@@ -123,7 +123,7 @@ f4b_in = os.path.join('build', 'dir', 'f4b.in')
 f4b_out = os.path.join('build', 'dir', 'f4b.out')
 test.run(chdir = 'sub4',
          arguments = '-u',
-         stdout = "scons: Entering directory %s\n" % test.workpath() + \
+         stdout = "scons: Entering directory `%s'\n" % test.workpath() + \
                   test.wrap_stdout("""\
 scons: building associated BuildDir targets: build
 cat("%s", "%s")