Commit 29ac6465 authored by Falko Timme's avatar Falko Timme
Browse files

- Make sure tar backups are not deleted because of a return value of 1; tar...

- Make sure tar backups are not deleted because of a return value of 1; tar can return 1 because of harmless warnings but still produces valid backups.
parent 5d843596
...@@ -1135,7 +1135,7 @@ if($backup_dir != '') { ...@@ -1135,7 +1135,7 @@ if($backup_dir != '') {
$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.tar.gz'; $web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.tar.gz';
exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=backup\* --directory '.escapeshellarg($web_path).' .', $tmp_output, $retval); exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=backup\* --directory '.escapeshellarg($web_path).' .', $tmp_output, $retval);
} }
if($retval == 0){ if($retval == 0 || $backup_mode != 'userzip'){ // tar can return 1 (due to harmless warings) and still create valid backups
chown($web_backup_dir.'/'.$web_backup_file, 'root'); chown($web_backup_dir.'/'.$web_backup_file, 'root');
chgrp($web_backup_dir.'/'.$web_backup_file, 'root'); chgrp($web_backup_dir.'/'.$web_backup_file, 'root');
chmod($web_backup_dir.'/'.$web_backup_file, 0750); chmod($web_backup_dir.'/'.$web_backup_file, 0750);
......
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