Handle Repositories without an SConsignFile() in them.

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

diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py
index 9b5c420958480b7b67a11d75e3f980aaca3ac95d..cbe0b8c641e6f99eba6ba597748a0a0c7a65d6f7 100644 (file)
--- a/src/engine/SCons/SConsign.py
+++ b/src/engine/SCons/SConsign.py
@@ -40,8 +40,6 @@ import SCons.Node
 import SCons.Sig
 import SCons.Warnings
 
-from SCons.Debug import Trace
-
 def corrupt_dblite_warning(filename):
     SCons.Warnings.warn(SCons.Warnings.CorruptSConsignWarning,
                         "Ignoring corrupt .sconsign file: %s"%filename)
@@ -163,9 +161,12 @@ class DB(Base):
 
         db, mode = Get_DataBase(dir)
 
-        tpath = norm_entry(dir.tpath)
+        # Read using the path relative to the top of the Repository
+        # (self.dir.tpath) from which we're fetching the signature
+        # information.
+        path = norm_entry(dir.tpath)
         try:
-            rawentries = db[tpath]
+            rawentries = db[path]
         except KeyError:
             pass
         else:
@@ -191,17 +192,26 @@ class DB(Base):
         sig_files.append(self)
 
     def write(self, sync=1):
-        if self.dirty:
-            db, mode = Get_DataBase(self.dir)
-            db[norm_entry(self.dir.tpath)] = cPickle.dumps(self.entries, 1)
-            if sync:
-                try:
-                    syncmethod = db.sync
-                except AttributeError:
-                    # Not all anydbm modules have sync() methods.
-                    pass
-                else:
-                    syncmethod()
+        if not self.dirty:
+            return
+
+        db, mode = Get_DataBase(self.dir)
+
+        # Write using the path relative to the top of the SConstruct
+        # directory (self.dir.path), not relative to the top of
+        # the Repository; we only write to our own .sconsign file,
+        # not to .sconsign files in Repositories.
+        path = norm_entry(self.dir.path)
+        db[path] = cPickle.dumps(self.entries, 1)
+
+        if sync:
+            try:
+                syncmethod = db.sync
+            except AttributeError:
+                # Not all anydbm modules have sync() methods.
+                pass
+            else:
+                syncmethod()
 
 class Dir(Base):
     def __init__(self, fp=None, module=None):

diff --git a/test/Repository/no-SConsignFile.py b/test/Repository/no-SConsignFile.py
new file mode 100644 (file)
index 0000000..d838605
--- /dev/null
+++ b/test/Repository/no-SConsignFile.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test that using Repository() works even when the Repository has no
+SConsignFile() and the source Repository files have their signatures
+saved because they're older than the max_drift time.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('build', 'src')
+
+test.write(['build', 'SConstruct'], """\
+SetOption('max_drift', 1)
+Repository('..')
+env = Environment()
+env.Program('foo', 'src/foo.c')
+""")
+
+test.write(['src', 'foo.c'], """\
+#include <stdio.h>
+#include "foo.h"
+int
+main(int argc, char *argv[])
+{
+    argv[argc++] = "--";
+    printf("%s\\n", STRING);
+    printf("src/foo.c\\n");
+    exit (0);
+}
+""")
+
+test.write(['src', 'foo.h'], """\
+#define STRING "src/foo.h"
+""")
+
+# Make sure it's past the max_drift time,
+# so the source file signatures get saved.
+test.sleep(2)
+
+test.run(chdir='build', arguments='.')
+
+test.run(program=test.workpath('build', 'foo'),
+         stdout="src/foo.h\nsrc/foo.c\n")
+
+test.up_to_date(chdir='build', arguments='.')
+
+test.pass_test()