cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2745 from sfromm/issue2742

Browse source 
Fix test so that it is /bin/sh compliant (issue #2742)
This commit is contained in:
Michael DeHaan 2013-04-22 16:23:26 -07:00
commit f9f1d5ee42
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/runner/__init__.py
View file

@ -586,11 +586,9 @@ class Runner(object):
''' takes a remote md5sum without requiring python, and returns 0 if no file '''
path = pipes.quote(path)
test = ('if [ ! -e \"%s\" ]; then rc=0;'
'elif [ -d \"%s\" ]; then rc=3;'
'elif [ ! -f \"%s\" ]; then rc=1;'
'elif [ ! -r \"%s\" ]; then rc=2;'
'else rc=0; fi') % ((path,) * 4)
# The following test needs to be SH-compliant. BASH-isms will
# not work if /bin/sh points to a non-BASH shell.
test = "rc=0; [ -r \"%s\" ] || rc=2; [ -f \"%s\" ] || rc=1; [ -d \"%s\" ] && rc=3" % ((path,) * 3)
md5s = [
"(/usr/bin/md5sum %s 2>/dev/null)" % path, # Linux
"(/sbin/md5sum -q %s 2>/dev/null)" % path, # ?