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

Merge pull request #529 from davehatton/error_trapping_md5

Browse source 
improve error trapping for md5
This commit is contained in:
Michael DeHaan 2012-07-03 10:07:59 -07:00
commit e0a1c5be42
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
library/copy
View file

@ -37,6 +37,10 @@ def exit_kv(rc=0, **kwargs):
print dump_kv(kwargs) print dump_kv(kwargs)
sys.exit(rc) sys.exit(rc)
def md5_sum(f):
md5sum = os.popen("/usr/bin/md5sum %(file)s 2>/dev/null || /sbin/md5 -q %(file)s 2>/dev/null || /usr/bin/digest -a md5 -v %(file)s 2>/dev/null" % {"file": f}).read().split()[0]
return md5sum
if len(sys.argv) == 1: if len(sys.argv) == 1:
exit_kv(rc=1, failed=1, msg="incorrect number of arguments given") exit_kv(rc=1, failed=1, msg="incorrect number of arguments given")
@ -66,29 +70,29 @@ if dest:
if not os.path.exists(src): if not os.path.exists(src):
exit_kv(rc=1, failed=1, msg="Source %s failed to transfer" % (src)) exit_kv(rc=1, failed=1, msg="Source %s failed to transfer" % (src))
if os.path.exists(dest): # raise an error if there is no dest file
if not os.path.exists(dest):
exit_kv(rc=1, failed=1, msg="Destination %s does not exist" % (dest))
# raise an error if copy has no permission on dest # raise an error if copy has no permission on dest
if not os.access(dest, os.W_OK): if not os.access(dest, os.W_OK):
exit_kv(rc=1, failed=1, msg="Destination %s not writable" % (dest)) exit_kv(rc=1, failed=1, msg="Destination %s not writable" % (dest))
elif not os.access(dest, os.R_OK): elif not os.access(dest, os.R_OK):
exit_kv(rc=1, failed=1, msg="Destination %s not readable" % (dest)) exit_kv(rc=1, failed=1, msg="Destination %s not readable" % (dest))
else:
if not os.access(os.path.dirname(dest), os.W_OK):
exit_kv(rc=1, failed=1, msg="Destination %s not writable" % (dest))
md5sum = None md5sum_src = None
changed = False md5sum_src = md5_sum(src)
if os.path.exists(dest):
md5sum = os.popen("/usr/bin/md5sum %(file)s 2> /dev/null || /sbin/md5 -q %(file)s" % {"file": dest}).read().split()[0]
md5sum2 = os.popen("/usr/bin/md5sum %(file)s 2> /dev/null || /sbin/md5 -q %(file)s" % {"file": src}).read().split()[0] md5sum_dest = None
md5sum_dest = md5_sum(dest)
if md5sum != md5sum2: if md5sum_src != md5sum_dest:
os.system("cp %s %s" % (src, dest)) os.system("cp %s %s" % (src, dest))
changed = True changed = True
else:
changed = False
# mission accomplished # mission accomplished
#print "md5sum=%s changed=%s" % (md5sum2, changed) #print "md5sum=%s changed=%s" % (md5sum_dest, changed)
exit_kv(dest=dest, src=src, changed="md5sum=%s changed=%s" % (md5sum2, changed)) exit_kv(dest=dest, src=src, changed="md5sum=%s changed=%s" % (md5sum_dest, changed))

2
library/setup
View file

@ -312,7 +312,7 @@ def ansible_facts():
return facts return facts
def md5_sum(f): def md5_sum(f):
md5sum = os.popen("/usr/bin/md5sum %(file)s 2> /dev/null || /sbin/md5 -q %(file)s 2> /dev/null || /usr/bin/digest -a md5 -v %(file)s" % {"file": f}).read().split()[0] md5sum = os.popen("/usr/bin/md5sum %(file)s 2>/dev/null || /sbin/md5 -q %(file)s 2>/dev/null || /usr/bin/digest -a md5 -v %(file)s 2>/dev/null" % {"file": f}).read().split()[0]
return md5sum return md5sum
# load config & template variables # load config & template variables