Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/backup-exclusions' into 'dev'

Browse Source 
Fix backup error if excluded dir doesn't exists.

See merge request crafty-controller/crafty-4!301
This commit is contained in:
Andrew 2022-06-06 15:33:45 +00:00
commit 2696c8eb65
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/classes/shared/server.py
View File

@ -858,10 +858,20 @@ class ServerInstance:
if os.path.isdir(excluded_dir):
# If it is a directory,
# recursively delete the entire directory from the backup
FileHelpers.del_dirs(excluded_dir)
try:
FileHelpers.del_dirs(excluded_dir)
except FileNotFoundError:
Console.error(
f"Excluded dir {excluded_dir} not found. Moving on..."
)
else:
# If not, just remove the file
os.remove(excluded_dir)
try:
os.remove(excluded_dir)
except:
Console.error(
f"Excluded dir {excluded_dir} not found. Moving on..."
)
if conf["compress"]:
logger.debug(
"Found compress backup to be true. Calling compressed archive"