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

Till Brehm · Till Brehm · commit 2233652dc52a · 2017-06-15T11:35:39.000+02:00
Allow backup to complete if "file changed as we read it"

See merge request !605
diff --git 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 @@ public function onRunJob() {
 							}
 						}
 						
-						if($retval == 0){
+						if($retval <= 1){
 							chown($mail_backup_dir.'/'.$mail_backup_file, $backupusername);
 							chgrp($mail_backup_dir.'/'.$mail_backup_file, $backupgroup);
 							chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function onRunJob() {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- if($retval == 0){`
	`155`	`+ if($retval <= 1){`
`156`	`156`	`chown($mail_backup_dir.'/'.$mail_backup_file, $backupusername);`
`157`	`157`	`chgrp($mail_backup_dir.'/'.$mail_backup_file, $backupgroup);`
`158`	`158`	`chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);`