YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #738 from YunoHost/backup-delete-should-delete-symlink-target

Browse source 
[fix] Backup delete should delete symlink target
This commit is contained in:
Alexandre Aubin 2019-06-24 17:35:05 +02:00 • committed by GitHub
commit 40de70090e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/backup.py
View file

@ -2319,7 +2319,14 @@ def backup_delete(name):
archive_file = '%s/%s.tar.gz' % (ARCHIVES_PATH, name) archive_file = '%s/%s.tar.gz' % (ARCHIVES_PATH, name)
info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name) info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name)
for backup_file in [archive_file, info_file]: files_to_delete = [archive_file, info_file]
# To handle the case where archive_file is in fact a symlink
if os.islink(archive_file):
actual_archive = os.path.realpath(archive_file)
files_to_delete.append(actual_archive)
for backup_file in files_to_delete:
try: try:
os.remove(backup_file) os.remove(backup_file)
except: except: