From 838ed26786ce83de31a40ffb7f9fa31d5262fbb5 Mon Sep 17 00:00:00 2001
From: Martin <martin@enavn.com>
Date: Thu, 15 Jun 2017 15:04:11 +0200
Subject: [PATCH] Update: Allow backup to complete if "file changed as we read
it"
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
index 1fdf666485..5e84fb3417 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -152,7 +152,7 @@ class cronjob_backup_mail extends cronjob {
}
}
- if($retval <= 1){
+ if($retval == 0 || ($backup_mode != 'userzip' && $retval == 1) || ($backup_mode == 'userzip' && $retval == 12)){// tar can return 1, zip can return 12(due to harmless warings) and still create valid backups
chown($mail_backup_dir.'/'.$mail_backup_file, $backupusername);
chgrp($mail_backup_dir.'/'.$mail_backup_file, $backupgroup);
chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);
--
GitLab