diff options
| author | Akos Vandra <avandra@whitepages.com> | 2015-01-25 18:42:59 +0100 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-02-17 14:00:30 -0600 |
| commit | 8b8700d36517de3fa88a5c5d6afd5337473d54f6 (patch) | |
| tree | 3026cbd0fecd340c123dfe4154ee12c69a811ff8 | |
| parent | 8150b14d8d4a1d49a80ff9b4ace660ba4d03141e (diff) | |
| download | ansible-8b8700d36517de3fa88a5c5d6afd5337473d54f6.tar.gz | |
do not use with, it is not supported all the way down to 2.4
Conflicts:
v2/ansible/plugins/shell/sh.py
| -rw-r--r-- | lib/ansible/runner/shell_plugins/sh.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/runner/shell_plugins/sh.py b/lib/ansible/runner/shell_plugins/sh.py index 816b4c301c..ce21458852 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; 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 hashlib; BLOCKSIZE = 65536; hasher = hashlib.sha1();\nafile = open(\"%s\", \"rb\")\nbuf = afile.read(BLOCKSIZE)\nwhile len(buf) > 0:\n\thasher.update(buf)\n\tbuf = afile.read(BLOCKSIZE)\nafile.close()\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 ] |