From 14eaf7977377317f5468afcc926c33eddafe879f Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 4 Sep 2012 14:16:30 +0200 Subject: [PATCH] Move backup to module_common --- copy | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/copy b/copy index be7e685a8ab..9d9a00241bc 100755 --- a/copy +++ b/copy @@ -20,19 +20,6 @@ import os import shutil -import time - -def backuplocal(fn): - """make a date-marked backup of the specified file, return True or False on success or failure""" - # backups named basename-YYYY-MM-DD@HH:MM~ - ext = time.strftime("%Y-%m-%d@%H:%M~", time.localtime(time.time())) - backupdest = '%s.%s' % (fn, ext) - - try: - shutil.copy2(fn, backupdest) - except shutil.Error, e: - return False, 'Could not make backup of %s to %s: %s' % (fn, backupdest, e) - return True, backupdest def main(): @@ -76,11 +63,7 @@ def main(): try: if backup: if os.path.exists(dest): - success, msg = backuplocal(dest) - if not success: - module.fail_jason(msg=msg) - else: - backup_file = msg + backup_file = module.backuplocal(dest) shutil.copyfile(src, dest) except shutil.Error: module.fail_json(msg="failed to copy: %s and %s are the same" % (src, dest))