wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test so that it is /bin/sh compliant (issue #2742)

Browse source 
The old test used syntax that appeared to be bash-specific and did not
work on platforms where /bin/sh did not point to bash.  See issue #2742
where copy to solaris hosts failed with the error:

    output: {'stdout': '', 'stderr': '/bin/sh: test: argument expected\n',
             'rc': 1}
This commit is contained in:
Stephen Fromm 2013-04-22 16:14:27 -07:00
parent 7fabaec55f
commit ab3cb4912e
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 ''' ''' takes a remote md5sum without requiring python, and returns 0 if no file '''
path = pipes.quote(path) path = pipes.quote(path)
test = ('if [ ! -e \"%s\" ]; then rc=0;' # The following test needs to be SH-compliant. BASH-isms will
'elif [ -d \"%s\" ]; then rc=3;' # not work if /bin/sh points to a non-BASH shell.
'elif [ ! -f \"%s\" ]; then rc=1;' test = "rc=0; [ -r \"%s\" ] || rc=2; [ -f \"%s\" ] || rc=1; [ -d \"%s\" ] && rc=3" % ((path,) * 3)
'elif [ ! -r \"%s\" ]; then rc=2;'
'else rc=0; fi') % ((path,) * 4)
md5s = [ md5s = [
"(/usr/bin/md5sum %s 2>/dev/null)" % path, # Linux "(/usr/bin/md5sum %s 2>/dev/null)" % path, # Linux
"(/sbin/md5sum -q %s 2>/dev/null)" % path, # ? "(/sbin/md5sum -q %s 2>/dev/null)" % path, # ?