fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-2962

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-04-04 15:14:15 -04:00
parent bf56da719b
commit 475d0b5bf1
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.cli.php
View File

@@ -290,18 +290,14 @@ EOT;
$taskOpts[$validOpts[$optName]] = $optArg; $taskOpts[$validOpts[$optName]] = $optArg;
} }
} catch (Exception $e) { } catch (Exception $e) {
$token = strtotime("now"); echo self::error( "Invalid options: " . $e->getMessage() ) . "\n\n";
PMException::registerErrorLog($e, $token);
echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
self::help( $taskName ); self::help( $taskName );
return; return;
} }
try { try {
call_user_func( $taskData['function'], $arguments, $taskOpts ); call_user_func( $taskData['function'], $arguments, $taskOpts );
} catch (Exception $e) { } catch (Exception $e) {
$token = strtotime("now"); echo self::error( "\n Error executing '$taskName':\n\n {$e->getMessage()}\n" ) . "\n";
PMException::registerErrorLog($e, $token);
echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
global $tempDirectory; global $tempDirectory;
if (!empty($tempDirectory)) { if (!empty($tempDirectory)) {
G::rm_dir($tempDirectory); G::rm_dir($tempDirectory);

13
workflow/engine/classes/class.wsTools.php
View File

@@ -1701,19 +1701,6 @@ class workspaceTools
if (Installer::isset_site($workspaceName)) { if (Installer::isset_site($workspaceName)) {
if ($overwrite) { if ($overwrite) {
if ($workspace->dbInfo['DB_NAME'] == $workspace->dbInfo['DB_RBAC_NAME']) {
$newDatabases = 1;
} else {
$newDatabases = 3;
}
if ($newDatabases != $oldDatabases) {
throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases.");
}
if (!$workspace->workspaceExists()) {
throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.');
}
CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n"); CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n");
} else { } else {
throw new Exception("Destination workspace already exist (use -o to overwrite)"); throw new Exception("Destination workspace already exist (use -o to overwrite)");