Don't update the .sconsign files when using -n. (Steve Leblanc)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7c1f03c0019a075a414d7c3062c8c211b88f16d4..aa18bf64d71dc5ba6844581d91c97e144c1c9a35 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -18,6 +18,17 @@ RELEASE 0.15 - XXX
   - Fix man page bugs: remove duplicate AddPostAction() description;
     document no_import_lib.
 
+  - Eliminate a dependency on the distutils.fancy_getopt module by
+    copying and pasting its wrap_text() function directly.
+
+  From Steve Leblanc:
+
+  - Don't update the .sconsign files when run with -n.
+
+  From David Snopek and Christoph Wiedemann
+
+  - Fix use of the SConf subsystem with SConscriptChdir().
+
 
 
 RELEASE 0.14 - Wed, 21 May 2003 05:16:32 -0500

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index c5e469aa3c2c628a922d425c5c676da6d3fddf8b..1c773f0c462f1d5ce163cf1cdfc2f6f29fe583f6 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -959,7 +959,8 @@ def _main():
         jobs.run()
     finally:
         display("scons: " + closing_message)
-        SCons.Sig.write()
+        if not options.noexec:
+            SCons.Sig.write()
 
 def main():
     global exit_status

diff --git a/test/option-n.py b/test/option-n.py
index b71648d62b22b785e8bf5414c5a79f8ffbe18bbf..bccb785b866c4c08845fb62d6fdf1f3fb46b5352 100644 (file)
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -109,7 +109,15 @@ test.fail_test(os.path.exists(test.workpath('f2.out')))
 
 test.run(arguments = args)
 test.fail_test(not os.path.exists(test.workpath('f1.out')))
-test.fail_test(not os.path.exists(test.workpath('f2.out')))
+
+# Test that SCons does not write a modified .sconsign when -n is used.
+expect = test.wrap_stdout("""\
+%s build.py f1.out
+""" % python)
+test.unlink('.sconsign')
+test.write('f1.out', "X1.out\n")
+test.run(arguments = '-n f1.out', stdout = expect)
+test.run(arguments = '-n f1.out', stdout = expect)
 
 def wrap_clean_stdout(string):
     return "scons: Reading SConscript files ...\n" + \