Allow exit code 1 from borg(files changed while backing up), #6776

helmo · helmo · commit c563f427a71a · 2024-12-27T10:52:38.000+01:00
diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
@@ -1994,7 +1994,8 @@ protected static function make_web_backup($web_domain, $backup_job)
                         'cd ? && ' . $command . ' ' . $command_opts . ' ' . $excludes . ' ? .',
                         $web_path, $backup_repos_path . '::' . $web_backup_archive
                     );
-                    $success = $app->system->last_exec_retcode() == 0;
+                    // Exit code 1 means a file changed during backup, not ideal but not a failure either.
+                    $success = $app->system->last_exec_retcode() == 0 || $app->system->last_exec_retcode() == 1;
             }
 
             if ($success) {

Original file line number	Diff line number	Diff line change
`@@ -1994,7 +1994,8 @@ protected static function make_web_backup($web_domain, $backup_job)`
`1994`	`1994`	`'cd ? && ' . $command . ' ' . $command_opts . ' ' . $excludes . ' ? .',`
`1995`	`1995`	`$web_path, $backup_repos_path . '::' . $web_backup_archive`
`1996`	`1996`	`);`
`1997`		`- $success = $app->system->last_exec_retcode() == 0;`
	`1997`	`+ // Exit code 1 means a file changed during backup, not ideal but not a failure either.`
	`1998`	`+ $success = $app->system->last_exec_retcode() == 0 \|\| $app->system->last_exec_retcode() == 1;`
`1998`	`1999`	`}`
`1999`	`2000`
`2000`	`2001`	`if ($success) {`