Gracefully handle the case where a .sconsign file can't be written

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

diff --git a/src/engine/SCons/Sig/__init__.py b/src/engine/SCons/Sig/__init__.py
index fb34fa3c1709b7b73ea13b16c8674d892635d630..22ec2e9a385dd03cd9397e967ebe3e1f81a840f8 100644 (file)
--- a/src/engine/SCons/Sig/__init__.py
+++ b/src/engine/SCons/Sig/__init__.py
@@ -116,11 +116,15 @@ class SConsignFile:
         Write the .sconsign file to disk.
         """
         if self.dirty:
-            file = open(self.sconsign, 'wt')
-            keys = self.entries.keys()
-            keys.sort()
-            for name in keys:
-                file.write("%s: %s\n" % (name, self.entries[name]))
+            try:
+                file = open(self.sconsign, 'wt')
+            except:
+                pass
+            else:
+                keys = self.entries.keys()
+                keys.sort()
+                for name in keys:
+                    file.write("%s: %s\n" % (name, self.entries[name]))
 
 
 class Calculator:

diff --git a/test/nonwritable-sconsign.py b/test/nonwritable-sconsign.py
new file mode 100644 (file)
index 0000000..350a63d
--- /dev/null
+++ b/test/nonwritable-sconsign.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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__ = "test/nonwritable-sconsign.py __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+import os
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env = Environment()
+env.Program(target = 'foo1', source = 'f1.c')
+""")
+
+test.write('f1.c', """
+int
+main(int argc, char *argv[])
+{
+       argv[argc++] = "--";
+       printf("f1.c\n");
+       exit (0);
+}
+""")
+
+test.write('.sconsign', "")
+
+# For *NIX, systems, make .sconsign not writable.
+# For Win32 systems, open it to lock it.
+os.chmod(test.workpath('.sconsign'), 0444)
+f = open(test.workpath('.sconsign'), 'r')
+
+test.run(arguments = ".")
+test.run(program = test.workpath('foo1'), stdout = "f1.c\n")
+
+os.chmod(test.workpath('.sconsign'), 0666)
+f.close()
+
+test.pass_test()