Restore MD5-Timestamp performance by removing try/except from every call. Also some optimized logic for updating and using the dependency_map built as part of the decider. Fixed tests. Note Deciders now need a fourth argument 'repo_node' which is the repository node for the file if it's to be used. This is currently only used by md5-timestamp decider File.changed_timestamp_then_content()

5 files changed, 7 insertions, 7 deletions

diff --git a/test/Decider/Environment.py b/test/Decider/Environment.py
index 58cd57b..4a23b5c 100644
--- a/test/Decider/Environment.py
+++ b/test/Decider/Environment.py
@@ -38,7 +38,7 @@ DefaultEnvironment(tools=[])
 import os.path
 env = Environment(tools=[])
 env.Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
-def my_decider(dependency, target, prev_ni):
+def my_decider(dependency, target, prev_ni, repo_node=None):
     return os.path.exists('has-changed')
 env.Decider(my_decider)
 """)
diff --git a/test/Decider/Node.py b/test/Decider/Node.py
index c1910de..0fa9726 100644
--- a/test/Decider/Node.py
+++ b/test/Decider/Node.py
@@ -38,7 +38,7 @@ import os.path
 file_in = File('file.in')
 file_out = File('file.out')
 Command(file_out, file_in, Copy('$TARGET', '$SOURCE'))
-def my_decider(dependency, target, prev_ni):
+def my_decider(dependency, target, prev_ni, repo_node):
     return os.path.exists('has-changed')
 file_in.Decider(my_decider)
 """)
diff --git a/test/Decider/default.py b/test/Decider/default.py
index 5d0a452..78f981e 100644
--- a/test/Decider/default.py
+++ b/test/Decider/default.py
@@ -36,7 +36,7 @@ test.write('SConstruct', """
 DefaultEnvironment(tools=[])
 import os.path
 Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
-def my_decider(dependency, target, prev_ni):
+def my_decider(dependency, target, prev_ni, repo_node=None):
     return os.path.exists('has-changed')
 Decider(my_decider)
 """)
diff --git a/test/Decider/mixed.py b/test/Decider/mixed.py
index 08daa7d..711bd2b 100644
--- a/test/Decider/mixed.py
+++ b/test/Decider/mixed.py
@@ -47,11 +47,11 @@ denv.Command('ddd.out', 'ddd.in',   Copy('$TARGET', '$SOURCE'))
 denv.Command('n2.out',  n2_in,      Copy('$TARGET', '$SOURCE'))
 env.Command( 'eee.out', 'eee.in',   Copy('$TARGET', '$SOURCE'))
 env.Command( 'n3.out',  n3_in,      Copy('$TARGET', '$SOURCE'))
-def default_decider(dependency, target, prev_ni):
+def default_decider(dependency, target, prev_ni, repo_node=None):
     return os.path.exists('default-has-changed')
-def env_decider(dependency, target, prev_ni):
+def env_decider(dependency, target, prev_ni, repo_node=None):
     return os.path.exists('env-has-changed')
-def node_decider(dependency, target, prev_ni):
+def node_decider(dependency, target, prev_ni, repo_node=None):
     return os.path.exists('node-has-changed')
 Decider(default_decider)
 env.Decider(env_decider)
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index 553ce27..48b5c83 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -77,7 +77,7 @@ env.Package( NAME           = 'foo',
 
 expect = """
 scons: *** Setting target is not supported for rpm.
-""" + test.python_file_line(test.workpath('SConstruct'), 12)
+""" + test.python_file_line(test.workpath('SConstruct'), 23)
 
 test.run(arguments='', status=2, stderr=expect)