diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-12-12 17:09:55 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-12-12 17:09:55 -0800 |
| commit | 21a4444c7ff694b375a8bbc812a7561f5f1970a3 (patch) | |
| tree | cbcd2375339964ef5194a97c699796d7db06a512 /SCons/Environment.py | |
| parent | e96607c1dd670e37dc9352c466c3d0b8f2670d88 (diff) | |
| download | scons-git-21a4444c7ff694b375a8bbc812a7561f5f1970a3.tar.gz | |
fix bad merge. Add note where we may want deprecation notice
Diffstat (limited to 'SCons/Environment.py')
| -rw-r--r-- | SCons/Environment.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/SCons/Environment.py b/SCons/Environment.py index 9f280e00b..e730b34bb 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -68,7 +68,6 @@ from SCons.Util import ( is_Sequence, is_String, is_Tuple, - md5, semi_deepcopy, semi_deepcopy_dict, to_String_for_subst, @@ -1499,8 +1498,7 @@ class Base(SubstitutionEnvironment): def Decider(self, function): copy_function = self._copy2_from_cache if function in ('MD5', 'content'): - if not SCons.Util.md5: - raise UserError("MD5 signatures are not available in this version of Python.") + # TODO: Handle if user requests MD5 and not content with deprecation notice function = self._changed_content elif function in ('MD5-timestamp', 'content-timestamp'): function = self._changed_timestamp_then_content |