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

Merge pull request #10629 from bcoca/backup_local_exists

Browse source 
backup_local now only tries to back up exising files, returns '' otherwise
This commit is contained in:
Brian Coca 2015-04-10 19:12:48 -04:00
commit e6fa169a05
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/basic.py
View file

@ -1297,6 +1297,9 @@ class AnsibleModule(object):
def backup_local(self, fn): def backup_local(self, fn):
'''make a date-marked backup of the specified file, return True or False on success or failure''' '''make a date-marked backup of the specified file, return True or False on success or failure'''
backupdest = ''
if os.path.exists(fn):
# backups named basename-YYYY-MM-DD@HH:MM:SS~ # backups named basename-YYYY-MM-DD@HH:MM:SS~
ext = time.strftime("%Y-%m-%d@%H:%M:%S~", time.localtime(time.time())) ext = time.strftime("%Y-%m-%d@%H:%M:%S~", time.localtime(time.time()))
backupdest = '%s.%s' % (fn, ext) backupdest = '%s.%s' % (fn, ext)
@ -1305,6 +1308,7 @@ class AnsibleModule(object):
shutil.copy2(fn, backupdest) shutil.copy2(fn, backupdest)
except (shutil.Error, IOError), e: except (shutil.Error, IOError), e:
self.fail_json(msg='Could not make backup of %s to %s: %s' % (fn, backupdest, e)) self.fail_json(msg='Could not make backup of %s to %s: %s' % (fn, backupdest, e))
return backupdest return backupdest
def cleanup(self, tmpfile): def cleanup(self, tmpfile):