From 68c30a943a9ef06c58553e3982226be19bef6c8d Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 29 May 2019 12:57:31 +0200 Subject: [PATCH 1/2] Add exception for data backup --- data/helpers.d/backup | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/data/helpers.d/backup b/data/helpers.d/backup index ee524ef7f..b347f1700 100644 --- a/data/helpers.d/backup +++ b/data/helpers.d/backup @@ -59,12 +59,18 @@ ynh_backup() { local not_mandatory="${not_mandatory:-0}" BACKUP_CORE_ONLY=${BACKUP_CORE_ONLY:-0} + test -n "${app:-}" && do_not_backup_data=$(ynh_app_setting_get $app do_not_backup_data) # If backing up core only (used by ynh_backup_before_upgrade), # don't backup big data items - if [ "$is_big" == "1" ] && [ "$BACKUP_CORE_ONLY" == "1" ] ; then - ynh_print_info --message="$src_path will not be saved, because backup_core_only is set." - return 0 + if [ $is_big -eq 1 ] && ( [ ${do_not_backup_data:-0} -eq 1 ] || [ $BACKUP_CORE_ONLY -eq 1 ] ) + then + if [ $BACKUP_CORE_ONLY -eq 1 ]; then + ynh_print_warn --message="$src_path will not be saved, because 'BACKUP_CORE_ONLY' is set." + else + ynh_print_warn --message="$src_path will not be saved, because 'do_not_backup_data' is set." + fi + return 0 fi # ============================================================================== From 01e3be24da700ffe833e764f2cfd8730384f860a Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 14 Jun 2019 22:31:47 +0200 Subject: [PATCH 2/2] Update data/helpers.d/backup Co-Authored-By: Kayou --- data/helpers.d/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/backup b/data/helpers.d/backup index b347f1700..cfffe13d0 100644 --- a/data/helpers.d/backup +++ b/data/helpers.d/backup @@ -59,7 +59,7 @@ ynh_backup() { local not_mandatory="${not_mandatory:-0}" BACKUP_CORE_ONLY=${BACKUP_CORE_ONLY:-0} - test -n "${app:-}" && do_not_backup_data=$(ynh_app_setting_get $app do_not_backup_data) + test -n "${app:-}" && do_not_backup_data=$(ynh_app_setting_get --app=$app --key=do_not_backup_data) # If backing up core only (used by ynh_backup_before_upgrade), # don't backup big data items