Merge pull request #1331 from Jennydmz/BUG-9896

BUG 9896 Error message when restoring a workspace, that truncates the restore.
This commit is contained in:
julceslauhub
2013-02-18 07:58:19 -08:00

View File

@@ -380,7 +380,7 @@ function run_workspace_backup($args, $opts) {
$filename = PATH_DATA . "backups/$filename";
}
CLI::logging("Backing up to $filename\n");
$filesize = array_key_exists("filesize", $opts) ? $opts['filesize'] : -1;
if($filesize >= 0)
{
@@ -414,6 +414,9 @@ function run_workspace_backup($args, $opts) {
function run_workspace_restore($args, $opts) {
$filename = $args[0];
G::verifyPath(PATH_DATA . 'upgrade', true);
if (strpos($filename, "/") === false && strpos($filename, '\\') === false) {
$filename = PATH_DATA . "backups/$filename";
if (!file_exists($filename) && substr_compare($filename, ".tar", -4, 4, true) != 0)