Handle SConscript files in subdirectories.

2 files changed, 12 insertions, 1 deletions

diff --git a/src/engine/SCons/Sig/MD5.py b/src/engine/SCons/Sig/MD5.py
index 11ba961..e13669e 100644
--- a/src/engine/SCons/Sig/MD5.py
+++ b/src/engine/SCons/Sig/MD5.py
@@ -78,7 +78,11 @@ def collect(signatures):
 def signature(obj):
     """Generate a signature for an object
     """
-    return hexdigest(md5.new(obj.get_contents()).digest())
+    try:
+        contents = obj.get_contents()
+    except AttributeError:
+        raise AttributeError, "unable to fetch contents of '%s'" % str(obj)
+    return hexdigest(md5.new(contents).digest())
 
 def to_string(signature):
     """Convert a signature to a string"""
diff --git a/src/engine/SCons/Sig/MD5Tests.py b/src/engine/SCons/Sig/MD5Tests.py
index 641dcb0..f9cf61f 100644
--- a/src/engine/SCons/Sig/MD5Tests.py
+++ b/src/engine/SCons/Sig/MD5Tests.py
@@ -75,6 +75,13 @@ class MD5TestCase(unittest.TestCase):
 	o1 = my_obj(value = '111')
         assert '698d51a19d8a121ce581499d7b701668' == signature(o1)
 
+        try:
+            signature('string')
+        except AttributeError, e:
+            assert str(e) == "unable to fetch contents of 'string'"
+        else:
+            raise AttributeError, "unexpected get_contents() attribute"
+
     def test_to_string(self):
         assert '698d51a19d8a121ce581499d7b701668' == to_string('698d51a19d8a121ce581499d7b701668')