Commit 60290c24 authored by Till Brehm's avatar Till Brehm

Merge branch 'patch-3' into 'stable-3.1'

Update: Allow backup to complete if "file changed as we read it"

See merge request !606
parents a8f8a2aa 838ed267
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment