diff options
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 2 | ||||
| -rw-r--r-- | test/option-u.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 10cf7b3..dba2c7c 100644 --- 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 d2c60aa..d67b949 100644 --- 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 9cb0055..2b2ad4f 100644 --- 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") |