From 441630acc48bc58b71bd0fe100b73559e5180150 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 23 Jul 2020 23:43:35 +0530 Subject: [PATCH] fix: check file backup config before backing up files --- .../doctype/google_drive/google_drive.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py index c110694dff..58f28f882a 100644 --- a/frappe/integrations/doctype/google_drive/google_drive.py +++ b/frappe/integrations/doctype/google_drive/google_drive.py @@ -189,14 +189,17 @@ def upload_system_backup_to_google_drive(): if frappe.flags.create_new_backup: set_progress(1, "Backing up Data.") backup = new_backup() - fileurl_backup = backup.backup_path_db - fileurl_site_config = backup.site_config_backup_path - fileurl_public_files = backup.backup_path_files - fileurl_private_files = backup.backup_path_private_files - else: - fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files = get_latest_backup_file(with_files=True) + file_urls = [] + file_urls.append(backup.backup_path_db) + file_urls.append(backup.site_config_backup_path) - for fileurl in [fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files]: + if account.file_backup: + file_urls.append(backup.backup_path_files) + file_urls.append(backup.backup_path_private_files) + else: + file_urls = get_latest_backup_file(with_files=account.file_backup) + + for fileurl in file_urls: if not fileurl: continue