generalized cleanup function, in case modules want to use

removed return code as it doesn't make sense anymore
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
This commit is contained in:
Brian Coca 2013-05-05 13:26:29 -04:00
parent 96d4225245
commit d163deaf45

View file

@ -147,11 +147,7 @@ def main():
(rc,out,err) = module.run_command(validate % src)
if rc != 0:
module.fail_json(msg="failed to validate: rc:%s error:%s" % (rc,err))
if not module.atomic_move(src, dest):
try:
os.unlink(src) # cleanup tmp files on failure
except OSError, e:
sys.stderr.write("failed to clean up tmp file %s: %s\n" % (src, e))
module.atomic_move(src, dest):
except IOError:
module.fail_json(msg="failed to copy: %s to %s" % (src, dest))
changed = True