summaryrefslogtreecommitdiffstats
path: root/buildtools
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2014-01-07 15:55:56 +0100
committerAndrew Bartlett <abartlet@samba.org>2014-01-08 18:20:19 +1300
commitaf5102fe0075520d62beba412c994d4a74f5446b (patch)
tree7a669eb29014f4c080dbf29a9392d2bf3f0aa7a9 /buildtools
parent8e5f4eab764918353cfb17fddb6abe6a2b737f6c (diff)
downloadsamba-af5102fe0075520d62beba412c994d4a74f5446b.tar.gz
samba-af5102fe0075520d62beba412c994d4a74f5446b.tar.xz
samba-af5102fe0075520d62beba412c994d4a74f5446b.zip
build: test the generic md5 function after importing it from hashlib
otherwise we used the one from md5 which lead to the following warning on SerNet-imini: the md5 module is deprecated; use hashlib instead import md5 Signed-off-by: Bjoern Jacke <bj@sernet.de> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index c1ac7e29b21..0b0bb483781 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -391,7 +391,7 @@ try:
# Even if hashlib.md5 exists, it may be unusable.
# Try to use MD5 function. In FIPS mode this will cause an exception
# and we'll get to the replacement code
- foo = md5.md5('abcd')
+ foo = md5('abcd')
except:
try:
import md5