diff options
author | Akos Vandra <avandra@whitepages.com> | 2015-01-25 14:51:01 +0100 |
---|---|---|
committer | Akos Vandra <avandra@whitepages.com> | 2015-01-25 14:51:01 +0100 |
commit | e8144b3b9012c1768f9249e9eda19847313485ef (patch) | |
tree | 45a796b212b94399dc09548d3165b0349e43311b | |
parent | 53a3644ecd49dc7e9ee1a5ba5131a9298055dd33 (diff) | |
download | ansible-e8144b3b9012c1768f9249e9eda19847313485ef.tar.gz |
fixes #10086
-rw-r--r-- | lib/ansible/runner/shell_plugins/sh.py | 2 | ||||
-rw-r--r-- | v2/ansible/plugins/shell/sh.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/runner/shell_plugins/sh.py b/lib/ansible/runner/shell_plugins/sh.py index c43a8e725c..816b4c301c 100644 --- a/lib/ansible/runner/shell_plugins/sh.py +++ b/lib/ansible/runner/shell_plugins/sh.py @@ -98,7 +98,7 @@ class ShellModule(object): test = "rc=flag; [ -r \'%(p)s\' ] || rc=2; [ -f \'%(p)s\' ] || rc=1; [ -d \'%(p)s\' ] && rc=3; %(i)s -V 2>/dev/null || rc=4; [ x\"$rc\" != \"xflag\" ] && echo \"${rc}\"\' %(p)s\' && exit 0" % dict(p=path, i=python_interp) csums = [ - "(%s -c 'import hashlib; print(hashlib.sha1(open(\"%s\", \"rb\").read()).hexdigest())' 2>/dev/null)" % (python_interp, path), # Python > 2.4 (including python3) + "(%s -c 'import hashlib; BLOCKSIZE = 65536; hasher = hashlib.sha1();\nwith open(\"%s\", \"rb\") as afile:\n\tbuf = afile.read(BLOCKSIZE)\n\twhile len(buf) > 0:\n\t\thasher.update(buf)\n\t\tbuf = afile.read(BLOCKSIZE)\n\n\nprint(hasher.hexdigest())' 2>/dev/null)" % (python_interp, path), # Python > 2.4 (including python3) "(%s -c 'import sha; print(sha.sha(open(\"%s\", \"rb\").read()).hexdigest())' 2>/dev/null)" % (python_interp, path), # Python == 2.4 ] diff --git a/v2/ansible/plugins/shell/sh.py b/v2/ansible/plugins/shell/sh.py index c43a8e725c..816b4c301c 100644 --- a/v2/ansible/plugins/shell/sh.py +++ b/v2/ansible/plugins/shell/sh.py @@ -98,7 +98,7 @@ class ShellModule(object): test = "rc=flag; [ -r \'%(p)s\' ] || rc=2; [ -f \'%(p)s\' ] || rc=1; [ -d \'%(p)s\' ] && rc=3; %(i)s -V 2>/dev/null || rc=4; [ x\"$rc\" != \"xflag\" ] && echo \"${rc}\"\' %(p)s\' && exit 0" % dict(p=path, i=python_interp) csums = [ - "(%s -c 'import hashlib; print(hashlib.sha1(open(\"%s\", \"rb\").read()).hexdigest())' 2>/dev/null)" % (python_interp, path), # Python > 2.4 (including python3) + "(%s -c 'import hashlib; BLOCKSIZE = 65536; hasher = hashlib.sha1();\nwith open(\"%s\", \"rb\") as afile:\n\tbuf = afile.read(BLOCKSIZE)\n\twhile len(buf) > 0:\n\t\thasher.update(buf)\n\t\tbuf = afile.read(BLOCKSIZE)\n\n\nprint(hasher.hexdigest())' 2>/dev/null)" % (python_interp, path), # Python > 2.4 (including python3) "(%s -c 'import sha; print(sha.sha(open(\"%s\", \"rb\").read()).hexdigest())' 2>/dev/null)" % (python_interp, path), # Python == 2.4 ] |