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

further md5 fixes

Browse source
This commit is contained in:
Dave Hatton 2012-07-08 17:39:57 +01:00
parent 921bf3da9d
commit 19b43cd454
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -746,7 +746,8 @@ class Runner(object):
test = "[[ -r %s ]]" % path test = "[[ -r %s ]]" % path
md5s = [ md5s = [
"(%s && /usr/bin/md5sum %s 2>/dev/null)" % (test,path), "(%s && /usr/bin/md5sum %s 2>/dev/null)" % (test,path),
"(%s && /sbin/md5sum -q %s 2>/dev/null)" % (test,path) "(%s && /sbin/md5sum -q %s 2>/dev/null)" % (test,path),
"(%s && /usr/bin/digest -a md5 -v %s 2>/dev/null)" % (test,path)
] ]
cmd = " || ".join(md5s) cmd = " || ".join(md5s)
cmd = "%s || (echo \"0 %s\")" % (cmd, path) cmd = "%s || (echo \"0 %s\")" % (cmd, path)

9
lib/ansible/utils.py
View file

@ -314,7 +314,14 @@ def parse_kv(args):
def local_md5(file): def local_md5(file):
''' compute local md5sum, return None if file is not present ''' ''' compute local md5sum, return None if file is not present '''
cmd = "/usr/bin/md5sum %s 2> /dev/null || /sbin/md5 -q %s" % (file,file) #was >>> cmd = "/usr/bin/md5sum %s 2> /dev/null || /sbin/md5 -q %s" % (file,file)
md5s = [
"(/usr/bin/md5sum %s 2>/dev/null)" % (file),
"(/sbin/md5sum -q %s 2>/dev/null)" % (file),
"(/usr/bin/digest -a md5 -v %s 2>/dev/null)" % (file)
]
cmd = " || ".join(md5s)
if not os.path.exists(file): if not os.path.exists(file):
return None return None
else: else: