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

PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos IMPROVEMENT

Browse Source 
- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
This commit is contained in:
Marco Antonio Nina
2014-09-29 11:38:08 -04:00
parent db80e8a0fa
commit aafd2d260c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1653,36 +1653,36 @@ class workspaceTools
CLI::logging(" Without changes... \n"); CLI::logging(" Without changes... \n");
return true; return true;
} }
CLI::logging(" Migrating version Enterprise Core...\n"); CLI::logging(" Migrating Enterprise Core version...\n");
if (!file_exists($pathNewFile)) { if (!file_exists($pathNewFile)) {
CLI::logging(" Creating folder in $pathNewFile\n"); CLI::logging(" Creating folder in $pathNewFile\n");
G::mk_dir($newDiretory, 0777); G::mk_dir($newDiretory, 0777);
} }
$shared_stat = stat(PATH_DATA); $shared_stat = stat(PATH_DATA);
if (file_exists($pathDirectoryEnterprise)) { if (file_exists($pathDirectoryEnterprise)) {
CLI::logging(" Copying Directory Enterprise to $pathNewFile...\n"); CLI::logging(" Copying Enterprise Directory to $pathNewFile...\n");
if ($shared_stat !== false) { if ($shared_stat !== false) {
workspaceTools::dirPerms($pathDirectoryEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']); workspaceTools::dirPerms($pathDirectoryEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']);
} else { } else {
CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n"); CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
} }
if (G::recursive_copy($pathDirectoryEnterprise, $pathNewFile . PATH_SEP. 'enterprise')) { if (G::recursive_copy($pathDirectoryEnterprise, $pathNewFile . PATH_SEP. 'enterprise')) {
CLI::logging(" Removing $pathDirectoryEnterprise...\n"); CLI::logging(" Removing $pathDirectoryEnterprise...\n");
G::rm_dir($pathDirectoryEnterprise); G::rm_dir($pathDirectoryEnterprise);
} else { } else {
CLI::logging(CLI::error(" Error: Failure at coping from $pathDirectoryEnterprise...\n")); CLI::logging(CLI::error(" Error: Failure to copy from $pathDirectoryEnterprise...\n"));
} }
if (file_exists($pathDirectoryEnterprise)) { if (file_exists($pathDirectoryEnterprise)) {
CLI::logging(CLI::info(" Remove manually $pathDirectoryEnterprise...\n")); CLI::logging(CLI::info(" Remove manually $pathDirectoryEnterprise...\n"));
} }
} }
if (file_exists($pathFileEnterprise)) { if (file_exists($pathFileEnterprise)) {
CLI::logging(" Copying file Enterprise.php to $pathNewFile...\n"); CLI::logging(" Copying Enterprise.php file to $pathNewFile...\n");
if ($shared_stat !== false) { if ($shared_stat !== false) {
workspaceTools::dirPerms($pathFileEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']); workspaceTools::dirPerms($pathFileEnterprise, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']);
} else { } else {
CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n"); CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
} }
CLI::logging(" Removing $pathFileEnterprise...\n"); CLI::logging(" Removing $pathFileEnterprise...\n");
copy($pathFileEnterprise , $pathNewFile. PATH_SEP . 'enterprise.php'); copy($pathFileEnterprise , $pathNewFile. PATH_SEP . 'enterprise.php');