From 6305f6dd179edef0693df8d910570de4993b0de1 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 4 Aug 2020 20:23:53 +0200
Subject: [PATCH] Fix options for dbbackup
---
aleksis/core/tasks.py | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/aleksis/core/tasks.py b/aleksis/core/tasks.py
index f391fe05b..4eb41f30f 100644
--- a/aleksis/core/tasks.py
+++ b/aleksis/core/tasks.py
@@ -19,11 +19,21 @@ def send_notification(notification: int, resend: bool = False) -> None:
def backup_data() -> None:
"""Backup database and media using django-dbbackup."""
# Assemble command-line options for dbbackup management command
- db_options = "-z " * settings.DBBACKUP_COMPRESS_DB + "-e" * settings.DBBACKUP_ENCRYPT_DB
+ db_options = (
+ ["-z"]
+ if settings.DBBACKUP_COMPRESS_DB
+ else [] + ["-e"]
+ if settings.DBBACKUP_ENCRYPT_DB
+ else []
+ )
media_options = (
- "-z " * settings.DBBACKUP_COMPRESS_MEDIA + "-e" * settings.DBBACKUP_ENCRYPT_MEDIA
+ ["-z"]
+ if settings.DBBACKUP_COMPRESS_MEDIA
+ else [] + "-e"
+ if settings.DBBACKUP_ENCRYPT_MEDIA
+ else []
)
# Hand off to dbbackup's management commands
- management.call_command("dbbackup", db_options)
- management.call_command("mediabackup", media_options)
+ management.call_command("dbbackup", *db_options)
+ management.call_command("mediabackup", *media_options)
--
GitLab