trim md5sum string so it does not contain the filename
also fix a bug/typo in the reporting from playbook
This commit is contained in:
parent
30bc528091
commit
e202fea4fa
2 changed files with 4 additions and 4 deletions
4
copy
4
copy
|
@ -22,11 +22,11 @@ if not os.path.exists(source):
|
||||||
md5sum = None
|
md5sum = None
|
||||||
changed = False
|
changed = False
|
||||||
if os.path.exists(dest):
|
if os.path.exists(dest):
|
||||||
md5sum = os.popen("md5sum %s" % dest).read()
|
md5sum = os.popen("md5sum %s" % dest).read().split()[0]
|
||||||
|
|
||||||
os.system("cp %s %s" % (source, dest))
|
os.system("cp %s %s" % (source, dest))
|
||||||
|
|
||||||
md5sum2 = os.popen("md5sum %s" % dest).read()
|
md5sum2 = os.popen("md5sum %s" % dest).read().split()[0]
|
||||||
|
|
||||||
if md5sum != md5sum2:
|
if md5sum != md5sum2:
|
||||||
changed = True
|
changed = True
|
||||||
|
|
4
template
4
template
|
@ -45,7 +45,7 @@ source = file(source).read()
|
||||||
changed = False
|
changed = False
|
||||||
md5sum = None
|
md5sum = None
|
||||||
if os.path.exists(dest):
|
if os.path.exists(dest):
|
||||||
md5sum = os.popen("md5sum %s" % dest).read()
|
md5sum = os.popen("md5sum %s" % dest).read().split()[0]
|
||||||
|
|
||||||
# call Jinja2 here and save the new template file
|
# call Jinja2 here and save the new template file
|
||||||
template = jinja2.Template(source)
|
template = jinja2.Template(source)
|
||||||
|
@ -58,7 +58,7 @@ f.close()
|
||||||
# other end unless things were successful
|
# other end unless things were successful
|
||||||
|
|
||||||
# record m5sum and return success and whether things have changed
|
# record m5sum and return success and whether things have changed
|
||||||
md5sum2 = os.popen("md5sum %s" % dest).read()
|
md5sum2 = os.popen("md5sum %s" % dest).read().split()[0]
|
||||||
|
|
||||||
if md5sum != md5sum2:
|
if md5sum != md5sum2:
|
||||||
changed = True
|
changed = True
|
||||||
|
|
Loading…
Reference in a new issue